Skip to content
Snippets Groups Projects
Commit 1a224c95 authored by Insun Song's avatar Insun Song Committed by Gilad Avidov
Browse files

net: wireless: bcmdhd: removing wake_locks based on runtimePM

Since runtimePM guarantee PCIe bus awake during its service time,
it can be safe to remove wake_locks.

This change should be made on top of CL/543783.
net: wireless: bcmdhd: add support for runtime pm
https://partner-android-review.googlesource.com/#/c/543783/



bug: 28313638
Change-Id: Idf7d62e1c49d6f8bb78bd824e9119fffb59a2cb0
Signed-off-by: default avatarInsun Song <insun.song@broadcom.com>
parent e94b5bab
Branches
Tags
No related merge requests found
...@@ -585,6 +585,7 @@ inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp) ...@@ -585,6 +585,7 @@ inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp)
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */ #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) */
} }
#if defined(BCMSDIO)
#define DHD_OS_WAKE_LOCK(pub) dhd_os_wake_lock(pub) #define DHD_OS_WAKE_LOCK(pub) dhd_os_wake_lock(pub)
#define DHD_OS_WAKE_UNLOCK(pub) dhd_os_wake_unlock(pub) #define DHD_OS_WAKE_UNLOCK(pub) dhd_os_wake_unlock(pub)
#define DHD_OS_WAKE_LOCK_TIMEOUT(pub) dhd_os_wake_lock_timeout(pub) #define DHD_OS_WAKE_LOCK_TIMEOUT(pub) dhd_os_wake_lock_timeout(pub)
...@@ -596,6 +597,16 @@ inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp) ...@@ -596,6 +597,16 @@ inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp)
dhd_os_wake_lock_ctrl_timeout_cancel(pub) dhd_os_wake_lock_ctrl_timeout_cancel(pub)
#define DHD_OS_WAKE_LOCK_WAIVE(pub) dhd_os_wake_lock_waive(pub) #define DHD_OS_WAKE_LOCK_WAIVE(pub) dhd_os_wake_lock_waive(pub)
#define DHD_OS_WAKE_LOCK_RESTORE(pub) dhd_os_wake_lock_restore(pub) #define DHD_OS_WAKE_LOCK_RESTORE(pub) dhd_os_wake_lock_restore(pub)
#else /* defined (BCMPCIE) && CONFIG_PM_RUNTIME */
#define DHD_OS_WAKE_LOCK(pub)
#define DHD_OS_WAKE_UNLOCK(pub)
#define DHD_OS_WAKE_LOCK_TIMEOUT(pub)
#define DHD_OS_WAKE_LOCK_RX_TIMEOUT_ENABLE(pub, val)
#define DHD_OS_WAKE_LOCK_CTRL_TIMEOUT_ENABLE(pub, val)
#define DHD_OS_WAKE_LOCK_CTRL_TIMEOUT_CANCEL(pub)
#define DHD_OS_WAKE_LOCK_WAIVE(pub)
#define DHD_OS_WAKE_LOCK_RESTORE(pub)
#endif
#define DHD_OS_WD_WAKE_LOCK(pub) dhd_os_wd_wake_lock(pub) #define DHD_OS_WD_WAKE_LOCK(pub) dhd_os_wd_wake_lock(pub)
#define DHD_OS_WD_WAKE_UNLOCK(pub) dhd_os_wd_wake_unlock(pub) #define DHD_OS_WD_WAKE_UNLOCK(pub) dhd_os_wd_wake_unlock(pub)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment