aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/ab8500_charger.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-21 16:18:23 -0400
committerTejun Heo <tj@kernel.org>2012-08-21 16:18:23 -0400
commit203b42f7317494ae5e5efc7be6fb7f29c927f102 (patch)
tree5636bc6da58284977678e0d2c2accc2573260a53 /drivers/power/ab8500_charger.c
parentee64e7f697ad7e5575e6ac8900cfb71975484421 (diff)
workqueue: make deferrable delayed_work initializer names consistent
Initalizers for deferrable delayed_work are confused. * __DEFERRED_WORK_INITIALIZER() * DECLARE_DEFERRED_WORK() * INIT_DELAYED_WORK_DEFERRABLE() Rename them to * __DEFERRABLE_WORK_INITIALIZER() * DECLARE_DEFERRABLE_WORK() * INIT_DEFERRABLE_WORK() This patch doesn't cause any functional changes. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/power/ab8500_charger.c')
-rw-r--r--drivers/power/ab8500_charger.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index d4f0c98428cb..0701dbc2b7e1 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2618,9 +2618,9 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
2618 } 2618 }
2619 2619
2620 /* Init work for HW failure check */ 2620 /* Init work for HW failure check */
2621 INIT_DELAYED_WORK_DEFERRABLE(&di->check_hw_failure_work, 2621 INIT_DEFERRABLE_WORK(&di->check_hw_failure_work,
2622 ab8500_charger_check_hw_failure_work); 2622 ab8500_charger_check_hw_failure_work);
2623 INIT_DELAYED_WORK_DEFERRABLE(&di->check_usbchgnotok_work, 2623 INIT_DEFERRABLE_WORK(&di->check_usbchgnotok_work,
2624 ab8500_charger_check_usbchargernotok_work); 2624 ab8500_charger_check_usbchargernotok_work);
2625 2625
2626 /* 2626 /*
@@ -2632,10 +2632,10 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
2632 * watchdog have to be kicked by the charger driver 2632 * watchdog have to be kicked by the charger driver
2633 * when the AC charger is disabled 2633 * when the AC charger is disabled
2634 */ 2634 */
2635 INIT_DELAYED_WORK_DEFERRABLE(&di->kick_wd_work, 2635 INIT_DEFERRABLE_WORK(&di->kick_wd_work,
2636 ab8500_charger_kick_watchdog_work); 2636 ab8500_charger_kick_watchdog_work);
2637 2637
2638 INIT_DELAYED_WORK_DEFERRABLE(&di->check_vbat_work, 2638 INIT_DEFERRABLE_WORK(&di->check_vbat_work,
2639 ab8500_charger_check_vbat_work); 2639 ab8500_charger_check_vbat_work);
2640 2640
2641 /* Init work for charger detection */ 2641 /* Init work for charger detection */