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

2 files changed, 4 insertions, 8 deletions

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);