nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: bluedroid_pm: Use wakeup_source_register/unregister

Browse Source 
In Linux v6.16, commit 142ba31d8b4a ("PM: wakeup: Do not expose 4 device
wakeup source APIs") made the wakeup_source_add/destroy internal
functions. Instead of using wakeup_source_add/destroy, use
wakeup_source_register/unregister which internally call
wakeup_source_add/destroy and have been supported since Linux v2.6.x
kernels.

JIRA LINQPJ14-60

Change-Id: I6c471677876192e8985c8c336f95184564618c8a
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3375073
(cherry picked from commit 8118ce4f4df7513d26ca3d0150cfa2104e969d35)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3461877
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2025-04-30 12:26:20 +01:00
committed by mobile promotions
parent eaa2a1abe1
commit 66ab02d7b9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/misc/bluedroid_pm.c
View File

@@ -50,7 +50,7 @@ struct bluedroid_pm_data {
struct regulator *vdd_3v3; struct regulator *vdd_3v3;
struct regulator *vdd_1v8; struct regulator *vdd_1v8;
struct rfkill *rfkill; struct rfkill *rfkill;
struct wakeup_source wake_lock; struct wakeup_source *wake_lock;
struct pm_qos_request resume_cpu_freq_req; struct pm_qos_request resume_cpu_freq_req;
bool resumed; bool resumed;
struct work_struct work; struct work_struct work;
@@ -153,7 +153,7 @@ static void bluedroid_pm_timer_expire(struct timer_list *timer)
/* BT can sleep */ /* BT can sleep */
BDP_DBG("Tx and Rx are idle, BT sleeping"); BDP_DBG("Tx and Rx are idle, BT sleeping");
bluedroid_pm_gpio_set_value(bluedroid_pm->ext_wake, 0); bluedroid_pm_gpio_set_value(bluedroid_pm->ext_wake, 0);
__pm_relax(&bluedroid_pm->wake_lock); __pm_relax(bluedroid_pm->wake_lock);
} else { } else {
/* BT Rx is busy, Reset Timer */ /* BT Rx is busy, Reset Timer */
BDP_DBG("Rx is busy, restarting the timer"); BDP_DBG("Rx is busy, restarting the timer");
@@ -180,7 +180,7 @@ static int bluedroid_pm_rfkill_set_power(void *data, bool blocked)
if (bluedroid_pm->vdd_1v8) if (bluedroid_pm->vdd_1v8)
ret |= regulator_disable(bluedroid_pm->vdd_1v8); ret |= regulator_disable(bluedroid_pm->vdd_1v8);
if (bluedroid_pm->ext_wake) if (bluedroid_pm->ext_wake)
__pm_relax(&bluedroid_pm->wake_lock); __pm_relax(bluedroid_pm->wake_lock);
if (bluedroid_pm->resume_min_frequency) if (bluedroid_pm->resume_min_frequency)
cpu_latency_qos_remove_request(&bluedroid_pm->resume_cpu_freq_req); cpu_latency_qos_remove_request(&bluedroid_pm->resume_cpu_freq_req);
} else { } else {
@@ -255,7 +255,7 @@ static ssize_t lpm_write_proc(struct file *file, const char __user *buffer,
BDP_DBG("Tx and Rx are idle, BT sleeping"); BDP_DBG("Tx and Rx are idle, BT sleeping");
bluedroid_pm_gpio_set_value( bluedroid_pm_gpio_set_value(
bluedroid_pm->ext_wake, 0); bluedroid_pm->ext_wake, 0);
__pm_relax(&bluedroid_pm->wake_lock); __pm_relax(bluedroid_pm->wake_lock);
} else { } else {
/* Reset Timer */ /* Reset Timer */
BDP_DBG("Rx is busy, restarting the timer"); BDP_DBG("Rx is busy, restarting the timer");
@@ -267,7 +267,7 @@ static ssize_t lpm_write_proc(struct file *file, const char __user *buffer,
BDP_DBG("Tx is busy, wake_lock taken, delete timer"); BDP_DBG("Tx is busy, wake_lock taken, delete timer");
bluedroid_pm_gpio_set_value( bluedroid_pm_gpio_set_value(
bluedroid_pm->ext_wake, 1); bluedroid_pm->ext_wake, 1);
__pm_stay_awake(&bluedroid_pm->wake_lock); __pm_stay_awake(bluedroid_pm->wake_lock);
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */ #if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete(&bluedroid_pm_timer); timer_delete(&bluedroid_pm_timer);
#else #else
@@ -466,7 +466,8 @@ static int bluedroid_pm_probe(struct platform_device *pdev)
goto free_ext_wake; goto free_ext_wake;
} }
/* initialize wake lock */ /* initialize wake lock */
wakeup_source_add(&bluedroid_pm->wake_lock); bluedroid_pm->wake_lock = wakeup_source_register(&pdev->dev,
dev_name(&pdev->dev));
/* Initialize timer */ /* Initialize timer */
timer_setup(&bluedroid_pm->bluedroid_pm_timer, timer_setup(&bluedroid_pm->bluedroid_pm_timer,
bluedroid_pm_timer_expire, 0); bluedroid_pm_timer_expire, 0);
@@ -510,7 +511,7 @@ static int bluedroid_pm_remove(struct platform_device *pdev)
if (bluedroid_pm->host_wake_irq > -1) if (bluedroid_pm->host_wake_irq > -1)
free_irq(bluedroid_pm->host_wake_irq, bluedroid_pm); free_irq(bluedroid_pm->host_wake_irq, bluedroid_pm);
if ((bluedroid_pm->ext_wake)) { if ((bluedroid_pm->ext_wake)) {
wakeup_source_destroy(&bluedroid_pm->wake_lock); wakeup_source_unregister(bluedroid_pm->wake_lock);
remove_bt_proc_interface(); remove_bt_proc_interface();
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */ #if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete(&bluedroid_pm_timer); timer_delete(&bluedroid_pm_timer);