From eafd967f9ba5316cde0f3c139c8c78c9f7a97f73 Mon Sep 17 00:00:00 2001 From: freak07 Date: Fri, 12 Nov 2021 12:19:11 +0100 Subject: [PATCH] google-modules: wlan: bcm4389: remove wlan_txfl_wake wakelock Signed-off-by: engstk --- .../wlan/bcmdhd/bcm4389/dhd_linux.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/google-modules/wlan/bcmdhd/bcm4389/dhd_linux.c b/drivers/google-modules/wlan/bcmdhd/bcm4389/dhd_linux.c index 7ca8df5b7..6a5266552 100644 --- a/drivers/google-modules/wlan/bcmdhd/bcm4389/dhd_linux.c +++ b/drivers/google-modules/wlan/bcmdhd/bcm4389/dhd_linux.c @@ -18148,6 +18148,7 @@ void dhd_pm_wake_unlock(dhd_pub_t *pub) #endif /* CONFIG_HAS_WAKELOCK */ } +#if 0 void dhd_txfl_wake_unlock(dhd_pub_t *pub) { #ifdef CONFIG_HAS_WAKELOCK @@ -18161,6 +18162,7 @@ void dhd_txfl_wake_unlock(dhd_pub_t *pub) } #endif /* CONFIG_HAS_WAKELOCK */ } +#endif void dhd_nan_wake_unlock(dhd_pub_t *pub) { @@ -18203,7 +18205,7 @@ dhd_os_check_wakelock_all(dhd_pub_t *pub) { #if defined(CONFIG_HAS_WAKELOCK) || defined(BCMSDIO) #if defined(CONFIG_HAS_WAKELOCK) - int l1, l2, l4, l7, l8, l9, l10; + int l1, l2, l4, l7, l8, l10; int l5 = 0, l6 = 0; int c, lock_active; #endif /* CONFIG_HAS_WAKELOCK */ @@ -18238,15 +18240,17 @@ dhd_os_check_wakelock_all(dhd_pub_t *pub) l6 = dhd_wake_lock_active(dhd->wl_scanwake); #endif /* DHD_USE_SCAN_WAKELOCK */ l8 = dhd_wake_lock_active(dhd->wl_pmwake); +#if 0 l9 = dhd_wake_lock_active(dhd->wl_txflwake); +#endif l10 = dhd_wake_lock_active(dhd->wl_nanwake); - lock_active = (l1 || l2 || l4 || l5 || l6 || l7 || l8 || l9 || l10); + lock_active = (l1 || l2 || l4 || l5 || l6 || l7 || l8 || l10); /* Indicate to the Host to avoid going to suspend if internal locks are up */ if (lock_active) { DHD_ERROR(("%s wakelock c-%d wl-%d wd-%d " - "ctl-%d intr-%d scan-%d evt-%d, pm-%d, txfl-%d nan-%d\n", - __FUNCTION__, c, l1, l2, l4, l5, l6, l7, l8, l9, l10)); + "ctl-%d intr-%d scan-%d evt-%d, pm-%d, nan-%d\n", + __FUNCTION__, c, l1, l2, l4, l5, l6, l7, l8, l10)); #ifdef RPM_FAST_TRIGGER if (pub->rpm_fast_trigger && l4) { DHD_ERROR(("%s : reset rpm_fast_trigger becasue of wl_ctrlwake activated\n", @@ -18466,7 +18470,9 @@ void dhd_os_wake_lock_init(struct dhd_info *dhd) dhd_wake_lock_init(dhd->wl_ctrlwake, dhd_bus_to_dev(dhd->pub.bus), "wlan_ctrl_wake"); dhd_wake_lock_init(dhd->wl_evtwake, dhd_bus_to_dev(dhd->pub.bus), "wlan_evt_wake"); dhd_wake_lock_init(dhd->wl_pmwake, dhd_bus_to_dev(dhd->pub.bus), "wlan_pm_wake"); +#if 0 dhd_wake_lock_init(dhd->wl_txflwake, dhd_bus_to_dev(dhd->pub.bus), "wlan_txfl_wake"); +#endif #ifdef BCMPCIE_OOB_HOST_WAKE dhd_wake_lock_init(dhd->wl_intrwake, dhd_bus_to_dev(dhd->pub.bus), "wlan_oob_irq_wake"); #endif /* BCMPCIE_OOB_HOST_WAKE */ @@ -18494,7 +18500,9 @@ void dhd_os_wake_lock_destroy(struct dhd_info *dhd) dhd_wake_lock_destroy(dhd->wl_ctrlwake); dhd_wake_lock_destroy(dhd->wl_evtwake); dhd_wake_lock_destroy(dhd->wl_pmwake); +#if 0 dhd_wake_lock_destroy(dhd->wl_txflwake); +#endif #ifdef BCMPCIE_OOB_HOST_WAKE dhd_wake_lock_destroy(dhd->wl_intrwake); #endif /* BCMPCIE_OOB_HOST_WAKE */