11 files changed, 21 insertions, 21 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 235a340e81f2..55f0354864e2 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -466,7 +466,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
         delay -= jiffies % delay;
 
         dbs_info->enable = 1;
-        INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
+        INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);
         schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
 }
 
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 836e9b062e5e..14c1af5a264f 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -644,7 +644,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
                 delay -= jiffies % delay;
 
         dbs_info->sample_type = DBS_NORMAL_SAMPLE;
-        INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
+        INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);
         schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
 }
 
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 70c31d43fff3..b146d76f04cf 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -607,7 +607,7 @@ static int __init devfreq_start_polling(void)
         mutex_lock(&devfreq_list_lock);
         polling = false;
         devfreq_wq = create_freezable_workqueue("devfreq_wq");
-        INIT_DELAYED_WORK_DEFERRABLE(&devfreq_work, devfreq_monitor);
+        INIT_DEFERRABLE_WORK(&devfreq_work, devfreq_monitor);
         mutex_unlock(&devfreq_list_lock);
 
         devfreq_monitor(&devfreq_work.work);
diff --git a/drivers/net/ethernet/mellanox/mlx4/sense.c b/drivers/net/ethernet/mellanox/mlx4/sense.c
index 802498293528..37b23780a4d8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/sense.c
+++ b/drivers/net/ethernet/mellanox/mlx4/sense.c
@@ -153,5 +153,5 @@ void  mlx4_sense_init(struct mlx4_dev *dev)
         for (port = 1; port <= dev->caps.num_ports; port++)
                 sense->do_sense_port[port] = 1;
 
-        INIT_DELAYED_WORK_DEFERRABLE(&sense->sense_poll, mlx4_sense_port);
+        INIT_DEFERRABLE_WORK(&sense->sense_poll, mlx4_sense_port);
 }
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index bba3ccac72fe..3041514f4d3f 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -1018,7 +1018,7 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
         }
 
         /* Init work for measuring temperature periodically */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->btemp_periodic_work,
+        INIT_DEFERRABLE_WORK(&di->btemp_periodic_work,
                 ab8500_btemp_periodic_work);
 
         /* Identify the battery */
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)
         }
 
         /* Init work for HW failure check */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->check_hw_failure_work,
+        INIT_DEFERRABLE_WORK(&di->check_hw_failure_work,
                 ab8500_charger_check_hw_failure_work);
-        INIT_DELAYED_WORK_DEFERRABLE(&di->check_usbchgnotok_work,
+        INIT_DEFERRABLE_WORK(&di->check_usbchgnotok_work,
                 ab8500_charger_check_usbchargernotok_work);
 
         /*
@@ -2632,10 +2632,10 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
          * watchdog have to be kicked by the charger driver
          * when the AC charger is disabled
          */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->kick_wd_work,
+        INIT_DEFERRABLE_WORK(&di->kick_wd_work,
                 ab8500_charger_kick_watchdog_work);
 
-        INIT_DELAYED_WORK_DEFERRABLE(&di->check_vbat_work,
+        INIT_DEFERRABLE_WORK(&di->check_vbat_work,
                 ab8500_charger_check_vbat_work);
 
         /* Init work for charger detection */
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index bf022255994c..5c9e7c263c38 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2516,19 +2516,19 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
         INIT_WORK(&di->fg_acc_cur_work, ab8500_fg_acc_cur_work);
 
         /* Init work for reinitialising the fg algorithm */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->fg_reinit_work,
+        INIT_DEFERRABLE_WORK(&di->fg_reinit_work,
                 ab8500_fg_reinit_work);
 
         /* Work delayed Queue to run the state machine */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->fg_periodic_work,
+        INIT_DEFERRABLE_WORK(&di->fg_periodic_work,
                 ab8500_fg_periodic_work);
 
         /* Work to check low battery condition */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->fg_low_bat_work,
+        INIT_DEFERRABLE_WORK(&di->fg_low_bat_work,
                 ab8500_fg_low_bat_work);
 
         /* Init work for HW failure check */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->fg_check_hw_failure_work,
+        INIT_DEFERRABLE_WORK(&di->fg_check_hw_failure_work,
                 ab8500_fg_check_hw_failure_work);
 
         /* Initialize OVV, and other registers */
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 804b88c760d6..4d302803ffcc 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -1848,9 +1848,9 @@ static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
         }
 
         /* Init work for chargalg */
-        INIT_DELAYED_WORK_DEFERRABLE(&di->chargalg_periodic_work,
+        INIT_DEFERRABLE_WORK(&di->chargalg_periodic_work,
                 abx500_chargalg_periodic_work);
-        INIT_DELAYED_WORK_DEFERRABLE(&di->chargalg_wd_work,
+        INIT_DEFERRABLE_WORK(&di->chargalg_wd_work,
                 abx500_chargalg_wd_work);
 
         /* Init work for chargalg */
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index c284143cfcd7..58e67830143c 100644
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -232,7 +232,7 @@ static int __devinit max17040_probe(struct i2c_client *client,
         max17040_reset(client);
         max17040_get_version(client);
 
-        INIT_DELAYED_WORK_DEFERRABLE(&chip->work, max17040_work);
+        INIT_DEFERRABLE_WORK(&chip->work, max17040_work);
         schedule_delayed_work(&chip->work, MAX17040_DELAY);
 
         return 0;
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 3f5acc7771da..6b5e6e0e202f 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -906,7 +906,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
                 r = -ENOMEM;
                 goto err_wq;
         }
-        INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
+        INIT_DEFERRABLE_WORK(&td->esd_work, taal_esd_work);
         INIT_DELAYED_WORK(&td->ulps_work, taal_ulps_work);
 
         dev_set_drvdata(&dssdev->dev, td);
@@ -962,8 +962,8 @@ static int taal_probe(struct omap_dss_device *dssdev)
                         goto err_irq;
                 }
 
-                INIT_DELAYED_WORK_DEFERRABLE(&td->te_timeout_work,
-                                        taal_te_timeout_work_callback);
+                INIT_DEFERRABLE_WORK(&td->te_timeout_work,
+                                     taal_te_timeout_work_callback);
 
                 dev_dbg(&dssdev->dev, "Using GPIO TE\n");
         }
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index b07e8864f82f..fd40f2625051 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4863,8 +4863,8 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev)
         mutex_init(&dsi->lock);
         sema_init(&dsi->bus_lock, 1);
 
-        INIT_DELAYED_WORK_DEFERRABLE(&dsi->framedone_timeout_work,
-                        dsi_framedone_timeout_work_callback);
+        INIT_DEFERRABLE_WORK(&dsi->framedone_timeout_work,
+                             dsi_framedone_timeout_work_callback);
 
 #ifdef DSI_CATCH_MISSING_TE
         init_timer(&dsi->te_timer);