diff --git a/core/cdf/inc/cdf_threads.h b/core/cdf/inc/cdf_threads.h deleted file mode 100644 index 8aa320c50d75..000000000000 --- a/core/cdf/inc/cdf_threads.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_THREADS_H) -#define __CDF_THREADS_H - -/** - * DOC: cdf_threads - * - * Connectivity driver framework (CDF) thread related APIs - * - */ - -/* Include Files */ -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_sleep() - sleep - * @msInterval : Number of milliseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return: nothing - */ -void cdf_sleep(uint32_t msInterval); - -/** - * cdf_sleep_us() - sleep - * @usInterval : Number of microseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return : nothing - */ -void cdf_sleep_us(uint32_t usInterval); - -/** - * cdf_busy_wait() - busy wait - * @usInterval : Number of microseconds to busy wait. - * - * This function places the current thread in busy wait until the specified - * time out interval elapses. If the interval is greater than 50us on WM, the - * behaviour is undefined. - * - * Return : nothing - */ -void cdf_busy_wait(uint32_t usInterval); - -#endif /* __CDF_THREADS_H */ diff --git a/core/cdf/src/cdf_threads.c b/core/cdf/src/cdf_threads.c deleted file mode 100644 index 6b408d567850..000000000000 --- a/core/cdf/src/cdf_threads.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_threads - * - * Connectivity driver framework (CDF) thread APIs - * - */ - -/* Include Files */ -#include -#include -#include -#include -#include -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_sleep() - sleep - * @msInterval : Number of milliseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return: nothing - */ -void cdf_sleep(uint32_t msInterval) -{ - if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return; - } - msleep_interruptible(msInterval); -} - -/** - * cdf_sleep_us() - sleep - * @usInterval : Number of microseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return : nothing - */ -void cdf_sleep_us(uint32_t usInterval) -{ - unsigned long timeout = usecs_to_jiffies(usInterval) + 1; - if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return; - } - - while (timeout && !signal_pending(current)) - timeout = schedule_timeout_interruptible(timeout); -} - -/** - * cdf_busy_wait() - busy wait - * @usInterval : Number of microseconds to busy wait. - * - * This function places the current thread in busy wait until the specified - * time out interval elapses. If the interval is greater than 50us on WM, the - * behaviour is undefined. - * - * Return : nothing - */ -void cdf_busy_wait(uint32_t usInterval) -{ - udelay(usInterval); -} diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index cf8ffb72f0a4..2292ac7f95a4 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 8848c56dd309..d1fdb08eec8e 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 282e26ca6a9f..3f4ee5eb9a4f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1901,7 +1901,7 @@ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) } while (ol_txrx_get_tx_pending(txrx_pdev)) { - cdf_sleep(OL_ATH_TX_DRAIN_WAIT_DELAY); + qdf_sleep(OL_ATH_TX_DRAIN_WAIT_DELAY); if (timeout <= 0) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: tx frames are pending", __func__);