workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()

cancel_rearming_delayed_work[queue]() has been superceded by
cancel_delayed_work_sync() quite some time ago.  Convert all the
in-kernel users.  The conversions are completely equivalent and
trivial.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: "David S. Miller" <davem@davemloft.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: netdev@vger.kernel.org
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Alex Elder <aelder@sgi.com>
Cc: xfs-masters@oss.sgi.com
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: netfilter-devel@vger.kernel.org
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: linux-nfs@vger.kernel.org

14 files changed, 19 insertions, 24 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 7f77c67d267c..6669b44044fb 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6122,7 +6122,7 @@ static void ata_port_detach(struct ata_port *ap)
         /* it better be dead now */
         WARN_ON(!(ap->pflags & ATA_PFLAG_UNLOADED));
 
-        cancel_rearming_delayed_work(&ap->hotplug_task);
+        cancel_delayed_work_sync(&ap->hotplug_task);
 
  skip_eh:
         if (ap->pmp_link) {
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index d05387d1e14b..8660a70f164a 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1320,7 +1320,7 @@ void ata_sff_flush_pio_task(struct ata_port *ap)
 {
         DPRINTK("ENTER\n");
 
-        cancel_rearming_delayed_work(&ap->sff_pio_task);
+        cancel_delayed_work_sync(&ap->sff_pio_task);
         ap->hsm_task_state = HSM_ST_IDLE;
 
         if (ata_msg_ctl(ap))
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 53cce3a5da23..39f660b2a60d 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -285,8 +285,8 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
 static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
 {
-        cancel_rearming_delayed_work(&rm->cpu[0].sniffer);
-        cancel_rearming_delayed_work(&rm->cpu[1].sniffer);
+        cancel_delayed_work_sync(&rm->cpu[0].sniffer);
+        cancel_delayed_work_sync(&rm->cpu[1].sniffer);
 }
 
 static int __devinit rackmeter_setup(struct rackmeter *rm)
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index b579fed3ab3f..0831469af69f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -298,7 +298,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
 int dvb_usb_remote_exit(struct dvb_usb_device *d)
 {
         if (d->state & DVB_USB_STATE_REMOTE) {
-                cancel_rearming_delayed_work(&d->rc_query_work);
+                cancel_delayed_work_sync(&d->rc_query_work);
                 flush_scheduled_work();
                 if (d->props.rc.mode == DVB_RC_LEGACY)
                         input_unregister_device(d->rc_input_dev);
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 6759cd5570dd..99403c720e3a 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -557,7 +557,7 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev)
 {
         if (dev->sbutton_input_dev != NULL) {
                 em28xx_info("Deregistering snapshot button\n");
-                cancel_rearming_delayed_work(&dev->sbutton_query_work);
+                cancel_delayed_work_sync(&dev->sbutton_query_work);
                 input_unregister_device(dev->sbutton_input_dev);
                 dev->sbutton_input_dev = NULL;
         }
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c
index 4c6028512d10..a683fd3bb624 100644
--- a/drivers/net/chelsio/my3126.c
+++ b/drivers/net/chelsio/my3126.c
@@ -22,7 +22,7 @@ static int my3126_interrupt_enable(struct cphy *cphy)
 
 static int my3126_interrupt_disable(struct cphy *cphy)
 {
-        cancel_rearming_delayed_work(&cphy->phy_update);
+        cancel_delayed_work_sync(&cphy->phy_update);
         return 0;
 }
 
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 06bb9b799458..e209efaa01b9 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1279,7 +1279,7 @@ static void emac_force_link_update(struct emac_instance *dev)
         netif_carrier_off(dev->ndev);
         smp_rmb();
         if (dev->link_polling) {
-                cancel_rearming_delayed_work(&dev->link_work);
+                cancel_delayed_work_sync(&dev->link_work);
                 if (dev->link_polling)
                         schedule_delayed_work(&dev->link_work,  PHY_POLL_LINK_OFF);
         }
@@ -1294,7 +1294,7 @@ static int emac_close(struct net_device *ndev)
 
         if (dev->phy.address >= 0) {
                 dev->link_polling = 0;
-                cancel_rearming_delayed_work(&dev->link_work);
+                cancel_delayed_work_sync(&dev->link_work);
         }
         mutex_lock(&dev->link_lock);
         emac_netif_stop(dev);
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 43307bd42a69..6107304cb94c 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -1207,7 +1207,6 @@ static void housekeeping_enable(struct zd_mac *mac)
 static void housekeeping_disable(struct zd_mac *mac)
 {
         dev_dbg_f(zd_mac_dev(mac), "\n");
-        cancel_rearming_delayed_workqueue(zd_workqueue,
-                &mac->housekeeping.link_led_work);
+        cancel_delayed_work_sync(&mac->housekeeping.link_led_work);
         zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
 }
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index b3c01c16a164..e7f89785beef 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -580,10 +580,8 @@ static int ds2760_battery_remove(struct platform_device *pdev)
 {
         struct ds2760_device_info *di = platform_get_drvdata(pdev);
 
-        cancel_rearming_delayed_workqueue(di->monitor_wqueue,
-                                          &di->monitor_work);
-        cancel_rearming_delayed_workqueue(di->monitor_wqueue,
-                                          &di->set_charged_work);
+        cancel_delayed_work_sync(&di->monitor_work);
+        cancel_delayed_work_sync(&di->set_charged_work);
         destroy_workqueue(di->monitor_wqueue);
         power_supply_unregister(&di->bat);
         kfree(di);
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 2a10cd361181..36cf402c0677 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -730,8 +730,7 @@ static __devinit int probe(int irq, struct device *dev)
 power_reg_failed_1:
         power_supply_unregister(&pbi->batt);
 power_reg_failed:
-        cancel_rearming_delayed_workqueue(pbi->monitor_wqueue,
-                                                &pbi->monitor_battery);
+        cancel_delayed_work_sync(&pbi->monitor_battery);
 requestirq_failed:
         destroy_workqueue(pbi->monitor_wqueue);
 wqueue_failed:
@@ -760,8 +759,7 @@ static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)
         struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
 
         free_irq(pbi->irq, pbi);
-        cancel_rearming_delayed_workqueue(pbi->monitor_wqueue,
-                                        &pbi->monitor_battery);
+        cancel_delayed_work_sync(&pbi->monitor_battery);
         destroy_workqueue(pbi->monitor_wqueue);
 
         power_supply_unregister(&pbi->usb);
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
index 61685ccceda8..d4a1f204b9d5 100644
--- a/drivers/staging/pohmelfs/inode.c
+++ b/drivers/staging/pohmelfs/inode.c
@@ -1318,8 +1318,8 @@ static void pohmelfs_put_super(struct super_block *sb)
         }
 
         psb->trans_scan_timeout = psb->drop_scan_timeout = 0;
-        cancel_rearming_delayed_work(&psb->dwork);
-        cancel_rearming_delayed_work(&psb->drop_dwork);
+        cancel_delayed_work_sync(&psb->dwork);
+        cancel_delayed_work_sync(&psb->drop_dwork);
         flush_scheduled_work();
 
         dprintk("%s: stopped workqueues.\n", __func__);
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index f383cb42b1d7..a845f8b8382f 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -1247,7 +1247,7 @@ static void cxacru_unbind(struct usbatm_data *usbatm_instance,
         mutex_unlock(&instance->poll_state_serialize);
 
         if (is_polling)
-                cancel_rearming_delayed_work(&instance->poll_work);
+                cancel_delayed_work_sync(&instance->poll_work);
 
         usb_kill_urb(instance->snd_urb);
         usb_kill_urb(instance->rcv_urb);
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 6b93ef93cb12..804000183c5e 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -75,7 +75,7 @@ int fb_deferred_io_fsync(struct file *file, int datasync)
                 return 0;
 
         /* Kill off the delayed work */
-        cancel_rearming_delayed_work(&info->deferred_work);
+        cancel_delayed_work_sync(&info->deferred_work);
 
         /* Run it immediately */
         return schedule_delayed_work(&info->deferred_work, 0);
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 64dcc7439c99..90e3bdd1b7ab 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -396,7 +396,7 @@ static void mipid_esd_start_check(struct mipid_device *md)
 static void mipid_esd_stop_check(struct mipid_device *md)
 {
         if (md->esd_check != NULL)
-                cancel_rearming_delayed_workqueue(md->esd_wq, &md->esd_work);
+                cancel_delayed_work_sync(&md->esd_work);
 }
 
 static void mipid_esd_work(struct work_struct *work)