Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 203b42f7317494ae5e5efc7be6fb7f29c927f102

Authored by Tejun Heo
1 parent ee64e7f697
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 18 changed files with 31 additions and 31 deletions Side-by-side Diff

arch/powerpc/platforms/cell/cpufreq_spudemand.c
Diff comments   View file @ 203b42f
... ... @@ -76,7 +76,7 @@
76 76 static void spu_gov_init_work(struct spu_gov_info_struct *info)
77 77 {
78 78 int delay = usecs_to_jiffies(info->poll_int);
79   - INIT_DELAYED_WORK_DEFERRABLE(&info->work, spu_gov_work);
  79 + INIT_DEFERRABLE_WORK(&info->work, spu_gov_work);
80 80 schedule_delayed_work_on(info->policy->cpu, &info->work, delay);
81 81 }
82 82  
drivers/cpufreq/cpufreq_conservative.c
Diff comments   View file @ 203b42f
... ... @@ -466,7 +466,7 @@
466 466 delay -= jiffies % delay;
467 467  
468 468 dbs_info->enable = 1;
469   - INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
  469 + INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);
470 470 schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
471 471 }
472 472  
drivers/cpufreq/cpufreq_ondemand.c
Diff comments   View file @ 203b42f
... ... @@ -644,7 +644,7 @@
644 644 delay -= jiffies % delay;
645 645  
646 646 dbs_info->sample_type = DBS_NORMAL_SAMPLE;
647   - INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
  647 + INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);
648 648 schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
649 649 }
650 650  
drivers/devfreq/devfreq.c
Diff comments   View file @ 203b42f
... ... @@ -607,7 +607,7 @@
607 607 mutex_lock(&devfreq_list_lock);
608 608 polling = false;
609 609 devfreq_wq = create_freezable_workqueue("devfreq_wq");
610   - INIT_DELAYED_WORK_DEFERRABLE(&devfreq_work, devfreq_monitor);
  610 + INIT_DEFERRABLE_WORK(&devfreq_work, devfreq_monitor);
611 611 mutex_unlock(&devfreq_list_lock);
612 612  
613 613 devfreq_monitor(&devfreq_work.work);
drivers/net/ethernet/mellanox/mlx4/sense.c
Diff comments   View file @ 203b42f
... ... @@ -153,6 +153,6 @@
153 153 for (port = 1; port <= dev->caps.num_ports; port++)
154 154 sense->do_sense_port[port] = 1;
155 155  
156   - INIT_DELAYED_WORK_DEFERRABLE(&sense->sense_poll, mlx4_sense_port);
  156 + INIT_DEFERRABLE_WORK(&sense->sense_poll, mlx4_sense_port);
157 157 }
drivers/power/ab8500_btemp.c
Diff comments   View file @ 203b42f
... ... @@ -1018,7 +1018,7 @@
1018 1018 }
1019 1019  
1020 1020 /* Init work for measuring temperature periodically */
1021   - INIT_DELAYED_WORK_DEFERRABLE(&di->btemp_periodic_work,
  1021 + INIT_DEFERRABLE_WORK(&di->btemp_periodic_work,
1022 1022 ab8500_btemp_periodic_work);
1023 1023  
1024 1024 /* Identify the battery */
drivers/power/ab8500_charger.c
Diff comments   View file @ 203b42f
... ... @@ -2618,9 +2618,9 @@
2618 2618 }
2619 2619  
2620 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 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 2624 ab8500_charger_check_usbchargernotok_work);
2625 2625  
2626 2626 /*
2627 2627  
... ... @@ -2632,10 +2632,10 @@
2632 2632 * watchdog have to be kicked by the charger driver
2633 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 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 2639 ab8500_charger_check_vbat_work);
2640 2640  
2641 2641 /* Init work for charger detection */
drivers/power/ab8500_fg.c
Diff comments   View file @ 203b42f
... ... @@ -2516,19 +2516,19 @@
2516 2516 INIT_WORK(&di->fg_acc_cur_work, ab8500_fg_acc_cur_work);
2517 2517  
2518 2518 /* Init work for reinitialising the fg algorithm */
2519   - INIT_DELAYED_WORK_DEFERRABLE(&di->fg_reinit_work,
  2519 + INIT_DEFERRABLE_WORK(&di->fg_reinit_work,
2520 2520 ab8500_fg_reinit_work);
2521 2521  
2522 2522 /* Work delayed Queue to run the state machine */
2523   - INIT_DELAYED_WORK_DEFERRABLE(&di->fg_periodic_work,
  2523 + INIT_DEFERRABLE_WORK(&di->fg_periodic_work,
2524 2524 ab8500_fg_periodic_work);
2525 2525  
2526 2526 /* Work to check low battery condition */
2527   - INIT_DELAYED_WORK_DEFERRABLE(&di->fg_low_bat_work,
  2527 + INIT_DEFERRABLE_WORK(&di->fg_low_bat_work,
2528 2528 ab8500_fg_low_bat_work);
2529 2529  
2530 2530 /* Init work for HW failure check */
2531   - INIT_DELAYED_WORK_DEFERRABLE(&di->fg_check_hw_failure_work,
  2531 + INIT_DEFERRABLE_WORK(&di->fg_check_hw_failure_work,
2532 2532 ab8500_fg_check_hw_failure_work);
2533 2533  
2534 2534 /* Initialize OVV, and other registers */
drivers/power/abx500_chargalg.c
Diff comments   View file @ 203b42f
... ... @@ -1848,9 +1848,9 @@
1848 1848 }
1849 1849  
1850 1850 /* Init work for chargalg */
1851   - INIT_DELAYED_WORK_DEFERRABLE(&di->chargalg_periodic_work,
  1851 + INIT_DEFERRABLE_WORK(&di->chargalg_periodic_work,
1852 1852 abx500_chargalg_periodic_work);
1853   - INIT_DELAYED_WORK_DEFERRABLE(&di->chargalg_wd_work,
  1853 + INIT_DEFERRABLE_WORK(&di->chargalg_wd_work,
1854 1854 abx500_chargalg_wd_work);
1855 1855  
1856 1856 /* Init work for chargalg */
drivers/power/max17040_battery.c
Diff comments   View file @ 203b42f
... ... @@ -232,7 +232,7 @@
232 232 max17040_reset(client);
233 233 max17040_get_version(client);
234 234  
235   - INIT_DELAYED_WORK_DEFERRABLE(&chip->work, max17040_work);
  235 + INIT_DEFERRABLE_WORK(&chip->work, max17040_work);
236 236 schedule_delayed_work(&chip->work, MAX17040_DELAY);
237 237  
238 238 return 0;
drivers/video/omap2/displays/panel-taal.c
Diff comments   View file @ 203b42f
... ... @@ -906,7 +906,7 @@
906 906 r = -ENOMEM;
907 907 goto err_wq;
908 908 }
909   - INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
  909 + INIT_DEFERRABLE_WORK(&td->esd_work, taal_esd_work);
910 910 INIT_DELAYED_WORK(&td->ulps_work, taal_ulps_work);
911 911  
912 912 dev_set_drvdata(&dssdev->dev, td);
... ... @@ -962,8 +962,8 @@
962 962 goto err_irq;
963 963 }
964 964  
965   - INIT_DELAYED_WORK_DEFERRABLE(&td->te_timeout_work,
966   - taal_te_timeout_work_callback);
  965 + INIT_DEFERRABLE_WORK(&td->te_timeout_work,
  966 + taal_te_timeout_work_callback);
967 967  
968 968 dev_dbg(&dssdev->dev, "Using GPIO TE\n");
969 969 }
drivers/video/omap2/dss/dsi.c
Diff comments   View file @ 203b42f
... ... @@ -4863,8 +4863,8 @@
4863 4863 mutex_init(&dsi->lock);
4864 4864 sema_init(&dsi->bus_lock, 1);
4865 4865  
4866   - INIT_DELAYED_WORK_DEFERRABLE(&dsi->framedone_timeout_work,
4867   - dsi_framedone_timeout_work_callback);
  4866 + INIT_DEFERRABLE_WORK(&dsi->framedone_timeout_work,
  4867 + dsi_framedone_timeout_work_callback);
4868 4868  
4869 4869 #ifdef DSI_CATCH_MISSING_TE
4870 4870 init_timer(&dsi->te_timer);
include/linux/workqueue.h
Diff comments   View file @ 203b42f
... ... @@ -139,7 +139,7 @@
139 139 0, (unsigned long)&(n)), \
140 140 }
141 141  
142   -#define __DEFERRED_WORK_INITIALIZER(n, f) { \
  142 +#define __DEFERRABLE_WORK_INITIALIZER(n, f) { \
143 143 .work = __WORK_INITIALIZER((n).work, (f)), \
144 144 .timer = TIMER_DEFERRED_INITIALIZER(delayed_work_timer_fn, \
145 145 0, (unsigned long)&(n)), \
... ... @@ -151,8 +151,8 @@
151 151 #define DECLARE_DELAYED_WORK(n, f) \
152 152 struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
153 153  
154   -#define DECLARE_DEFERRED_WORK(n, f) \
155   - struct delayed_work n = __DEFERRED_WORK_INITIALIZER(n, f)
  154 +#define DECLARE_DEFERRABLE_WORK(n, f) \
  155 + struct delayed_work n = __DEFERRABLE_WORK_INITIALIZER(n, f)
156 156  
157 157 /*
158 158 * initialize a work item's function pointer
... ... @@ -232,7 +232,7 @@
232 232 (_work)->timer.data = (unsigned long)(_work); \
233 233 } while (0)
234 234  
235   -#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func) \
  235 +#define INIT_DEFERRABLE_WORK(_work, _func) \
236 236 do { \
237 237 INIT_WORK(&(_work)->work, (_func)); \
238 238 init_timer_deferrable(&(_work)->timer); \
... ... @@ -900,7 +900,7 @@
900 900 */
901 901 if (keventd_up() && reap_work->work.func == NULL) {
902 902 init_reap_node(cpu);
903   - INIT_DELAYED_WORK_DEFERRABLE(reap_work, cache_reap);
  903 + INIT_DEFERRABLE_WORK(reap_work, cache_reap);
904 904 schedule_delayed_work_on(cpu, reap_work,
905 905 __round_jiffies_relative(HZ, cpu));
906 906 }
... ... @@ -1157,7 +1157,7 @@
1157 1157 {
1158 1158 struct delayed_work *work = &per_cpu(vmstat_work, cpu);
1159 1159  
1160   - INIT_DELAYED_WORK_DEFERRABLE(work, vmstat_update);
  1160 + INIT_DEFERRABLE_WORK(work, vmstat_update);
1161 1161 schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu));
1162 1162 }
1163 1163  
net/core/neighbour.c
Diff comments   View file @ 203b42f
... ... @@ -1545,7 +1545,7 @@
1545 1545 panic("cannot allocate neighbour cache hashes");
1546 1546  
1547 1547 rwlock_init(&tbl->lock);
1548   - INIT_DELAYED_WORK_DEFERRABLE(&tbl->gc_work, neigh_periodic_work);
  1548 + INIT_DEFERRABLE_WORK(&tbl->gc_work, neigh_periodic_work);
1549 1549 schedule_delayed_work(&tbl->gc_work, tbl->parms.reachable_time);
1550 1550 setup_timer(&tbl->proxy_timer, neigh_proxy_process, (unsigned long)tbl);
1551 1551 skb_queue_head_init_class(&tbl->proxy_queue,
... ... @@ -194,7 +194,7 @@
194 194 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC,
195 195 NULL);
196 196  
197   - INIT_DELAYED_WORK_DEFERRABLE(&gc_work, inetpeer_gc_worker);
  197 + INIT_DEFERRABLE_WORK(&gc_work, inetpeer_gc_worker);
198 198 }
199 199  
200 200 static int addr_compare(const struct inetpeer_addr *a,
... ... @@ -1635,7 +1635,7 @@
1635 1635  
1636 1636 void __init cache_initialize(void)
1637 1637 {
1638   - INIT_DELAYED_WORK_DEFERRABLE(&cache_cleaner, do_cache_clean);
  1638 + INIT_DEFERRABLE_WORK(&cache_cleaner, do_cache_clean);
1639 1639 }
1640 1640  
1641 1641 int cache_register_net(struct cache_detail *cd, struct net *net)