GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-15 18:53:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Tejun Heo 2010-12-14 16:21:17 +01:00
parent 2d64672ed3
commit afe2c511fb
22 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/ata/libata-core.c
View file

@ -6122,7 +6122,7 @@ static void ata_port_detach(struct ata_port *ap)
/* it better be dead now */ /* it better be dead now */
WARN_ON(!(ap->pflags & ATA_PFLAG_UNLOADED)); WARN_ON(!(ap->pflags & ATA_PFLAG_UNLOADED));
cancel_rearming_delayed_work(&ap->hotplug_task); cancel_delayed_work_sync(&ap->hotplug_task);
skip_eh: skip_eh:
if (ap->pmp_link) { if (ap->pmp_link) {

2
drivers/ata/libata-sff.c
View file

@ -1320,7 +1320,7 @@ void ata_sff_flush_pio_task(struct ata_port *ap)
{ {
DPRINTK("ENTER\n"); 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; ap->hsm_task_state = HSM_ST_IDLE;
if (ata_msg_ctl(ap)) if (ata_msg_ctl(ap))

4
drivers/macintosh/rack-meter.c
View file

@ -285,8 +285,8 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm) static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
{ {
cancel_rearming_delayed_work(&rm->cpu[0].sniffer); cancel_delayed_work_sync(&rm->cpu[0].sniffer);
cancel_rearming_delayed_work(&rm->cpu[1].sniffer); cancel_delayed_work_sync(&rm->cpu[1].sniffer);
} }
static int __devinit rackmeter_setup(struct rackmeter *rm) static int __devinit rackmeter_setup(struct rackmeter *rm)

2
drivers/media/dvb/dvb-usb/dvb-usb-remote.c
View file

@ -298,7 +298,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
int dvb_usb_remote_exit(struct dvb_usb_device *d) int dvb_usb_remote_exit(struct dvb_usb_device *d)
{ {
if (d->state & DVB_USB_STATE_REMOTE) { 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(); flush_scheduled_work();
if (d->props.rc.mode == DVB_RC_LEGACY) if (d->props.rc.mode == DVB_RC_LEGACY)
input_unregister_device(d->rc_input_dev); input_unregister_device(d->rc_input_dev);

2
drivers/media/video/em28xx/em28xx-input.c
View file

@ -557,7 +557,7 @@ void em28xx_deregister_snapshot_button(struct em28xx *dev)
{ {
if (dev->sbutton_input_dev != NULL) { if (dev->sbutton_input_dev != NULL) {
em28xx_info("Deregistering snapshot button\n"); 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); input_unregister_device(dev->sbutton_input_dev);
dev->sbutton_input_dev = NULL; dev->sbutton_input_dev = NULL;
} }

2
drivers/net/chelsio/my3126.c
View file

@ -22,7 +22,7 @@ static int my3126_interrupt_enable(struct cphy *cphy)
static int my3126_interrupt_disable(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; return 0;
} }

4
drivers/net/ibm_newemac/core.c
View file

@ -1279,7 +1279,7 @@ static void emac_force_link_update(struct emac_instance *dev)
netif_carrier_off(dev->ndev); netif_carrier_off(dev->ndev);
smp_rmb(); smp_rmb();
if (dev->link_polling) { if (dev->link_polling) {
cancel_rearming_delayed_work(&dev->link_work); cancel_delayed_work_sync(&dev->link_work);
if (dev->link_polling) if (dev->link_polling)
schedule_delayed_work(&dev->link_work, PHY_POLL_LINK_OFF); 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) { if (dev->phy.address >= 0) {
dev->link_polling = 0; dev->link_polling = 0;
cancel_rearming_delayed_work(&dev->link_work); cancel_delayed_work_sync(&dev->link_work);
} }
mutex_lock(&dev->link_lock); mutex_lock(&dev->link_lock);
emac_netif_stop(dev); emac_netif_stop(dev);

3
drivers/net/wireless/zd1211rw/zd_mac.c
View file

@ -1207,7 +1207,6 @@ static void housekeeping_enable(struct zd_mac *mac)
static void housekeeping_disable(struct zd_mac *mac) static void housekeeping_disable(struct zd_mac *mac)
{ {
dev_dbg_f(zd_mac_dev(mac), "\n"); dev_dbg_f(zd_mac_dev(mac), "\n");
cancel_rearming_delayed_workqueue(zd_workqueue, cancel_delayed_work_sync(&mac->housekeeping.link_led_work);
&mac->housekeeping.link_led_work);
zd_chip_control_leds(&mac->chip, ZD_LED_OFF); zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
} }

6
drivers/power/ds2760_battery.c
View file

@ -580,10 +580,8 @@ static int ds2760_battery_remove(struct platform_device *pdev)
{ {
struct ds2760_device_info *di = platform_get_drvdata(pdev); struct ds2760_device_info *di = platform_get_drvdata(pdev);
cancel_rearming_delayed_workqueue(di->monitor_wqueue, cancel_delayed_work_sync(&di->monitor_work);
&di->monitor_work); cancel_delayed_work_sync(&di->set_charged_work);
cancel_rearming_delayed_workqueue(di->monitor_wqueue,
&di->set_charged_work);
destroy_workqueue(di->monitor_wqueue); destroy_workqueue(di->monitor_wqueue);
power_supply_unregister(&di->bat); power_supply_unregister(&di->bat);
kfree(di); kfree(di);

6
drivers/power/intel_mid_battery.c
View file

@ -730,8 +730,7 @@ static __devinit int probe(int irq, struct device *dev)
power_reg_failed_1: power_reg_failed_1:
power_supply_unregister(&pbi->batt); power_supply_unregister(&pbi->batt);
power_reg_failed: power_reg_failed:
cancel_rearming_delayed_workqueue(pbi->monitor_wqueue, cancel_delayed_work_sync(&pbi->monitor_battery);
&pbi->monitor_battery);
requestirq_failed: requestirq_failed:
destroy_workqueue(pbi->monitor_wqueue); destroy_workqueue(pbi->monitor_wqueue);
wqueue_failed: 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); struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
free_irq(pbi->irq, pbi); free_irq(pbi->irq, pbi);
cancel_rearming_delayed_workqueue(pbi->monitor_wqueue, cancel_delayed_work_sync(&pbi->monitor_battery);
&pbi->monitor_battery);
destroy_workqueue(pbi->monitor_wqueue); destroy_workqueue(pbi->monitor_wqueue);
power_supply_unregister(&pbi->usb); power_supply_unregister(&pbi->usb);

4
drivers/staging/pohmelfs/inode.c
View file

@ -1318,8 +1318,8 @@ static void pohmelfs_put_super(struct super_block *sb)
} }
psb->trans_scan_timeout = psb->drop_scan_timeout = 0; psb->trans_scan_timeout = psb->drop_scan_timeout = 0;
cancel_rearming_delayed_work(&psb->dwork); cancel_delayed_work_sync(&psb->dwork);
cancel_rearming_delayed_work(&psb->drop_dwork); cancel_delayed_work_sync(&psb->drop_dwork);
flush_scheduled_work(); flush_scheduled_work();
dprintk("%s: stopped workqueues.\n", __func__); dprintk("%s: stopped workqueues.\n", __func__);

2
drivers/usb/atm/cxacru.c
View file

@ -1247,7 +1247,7 @@ static void cxacru_unbind(struct usbatm_data *usbatm_instance,
mutex_unlock(&instance->poll_state_serialize); mutex_unlock(&instance->poll_state_serialize);
if (is_polling) 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->snd_urb);
usb_kill_urb(instance->rcv_urb); usb_kill_urb(instance->rcv_urb);

2
drivers/video/fb_defio.c
View file

@ -75,7 +75,7 @@ int fb_deferred_io_fsync(struct file *file, int datasync)
return 0; return 0;
/* Kill off the delayed work */ /* Kill off the delayed work */
cancel_rearming_delayed_work(&info->deferred_work); cancel_delayed_work_sync(&info->deferred_work);
/* Run it immediately */ /* Run it immediately */
return schedule_delayed_work(&info->deferred_work, 0); return schedule_delayed_work(&info->deferred_work, 0);

2
drivers/video/omap/lcd_mipid.c
View file

@ -396,7 +396,7 @@ static void mipid_esd_start_check(struct mipid_device *md)
static void mipid_esd_stop_check(struct mipid_device *md) static void mipid_esd_stop_check(struct mipid_device *md)
{ {
if (md->esd_check != NULL) 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) static void mipid_esd_work(struct work_struct *work)

2
fs/nfsd/nfs4state.c
View file

@ -4336,7 +4336,7 @@ __nfs4_state_shutdown(void)
void void
nfs4_state_shutdown(void) nfs4_state_shutdown(void)
{ {
cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work); cancel_delayed_work_sync(&laundromat_work);
destroy_workqueue(laundry_wq); destroy_workqueue(laundry_wq);
locks_end_grace(&nfsd4_manager); locks_end_grace(&nfsd4_manager);
nfs4_lock_state(); nfs4_lock_state();

2
fs/xfs/xfs_mru_cache.c
View file

@ -408,7 +408,7 @@ xfs_mru_cache_flush(
spin_lock(&mru->lock); spin_lock(&mru->lock);
if (mru->queued) { if (mru->queued) {
spin_unlock(&mru->lock); spin_unlock(&mru->lock);
cancel_rearming_delayed_workqueue(xfs_mru_reap_wq, &mru->work); cancel_delayed_work_sync(&mru->work);
spin_lock(&mru->lock); spin_lock(&mru->lock);
} }

2
mm/slab.c
View file

@ -1293,7 +1293,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
* anything expensive but will only modify reap_work * anything expensive but will only modify reap_work
* and reschedule the timer. * and reschedule the timer.
*/ */
cancel_rearming_delayed_work(&per_cpu(slab_reap_work, cpu)); cancel_delayed_work_sync(&per_cpu(slab_reap_work, cpu));
/* Now the cache_reaper is guaranteed to be not running. */ /* Now the cache_reaper is guaranteed to be not running. */
per_cpu(slab_reap_work, cpu).work.func = NULL; per_cpu(slab_reap_work, cpu).work.func = NULL;
break; break;

2
mm/vmstat.c
View file

@ -1033,7 +1033,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
break; break;
case CPU_DOWN_PREPARE: case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN: case CPU_DOWN_PREPARE_FROZEN:
cancel_rearming_delayed_work(&per_cpu(vmstat_work, cpu)); cancel_delayed_work_sync(&per_cpu(vmstat_work, cpu));
per_cpu(vmstat_work, cpu).work.func = NULL; per_cpu(vmstat_work, cpu).work.func = NULL;
break; break;
case CPU_DOWN_FAILED: case CPU_DOWN_FAILED:

2
net/atm/lec.c
View file

@ -1608,7 +1608,7 @@ static void lec_arp_destroy(struct lec_priv *priv)
struct lec_arp_table *entry; struct lec_arp_table *entry;
int i; int i;
cancel_rearming_delayed_work(&priv->lec_arp_work); cancel_delayed_work_sync(&priv->lec_arp_work);
/* /*
* Remove all entries * Remove all entries

2
net/core/netpoll.c
View file

@ -925,7 +925,7 @@ void __netpoll_cleanup(struct netpoll *np)
skb_queue_purge(&npinfo->arp_tx); skb_queue_purge(&npinfo->arp_tx);
skb_queue_purge(&npinfo->txq); skb_queue_purge(&npinfo->txq);
cancel_rearming_delayed_work(&npinfo->tx_work); cancel_delayed_work_sync(&npinfo->tx_work);
/* clean after last, unfinished work */ /* clean after last, unfinished work */
__skb_queue_purge(&npinfo->txq); __skb_queue_purge(&npinfo->txq);

2
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -3432,7 +3432,7 @@ void ip_vs_control_cleanup(void)
{ {
EnterFunction(2); EnterFunction(2);
ip_vs_trash_cleanup(); ip_vs_trash_cleanup();
cancel_rearming_delayed_work(&defense_work); cancel_delayed_work_sync(&defense_work);
cancel_work_sync(&defense_work.work); cancel_work_sync(&defense_work.work);
ip_vs_kill_estimator(&ip_vs_stats); ip_vs_kill_estimator(&ip_vs_stats);
unregister_sysctl_table(sysctl_header); unregister_sysctl_table(sysctl_header);

2
net/sunrpc/xprtsock.c
View file

@ -770,7 +770,7 @@ static void xs_destroy(struct rpc_xprt *xprt)
dprintk("RPC: xs_destroy xprt %p\n", xprt); dprintk("RPC: xs_destroy xprt %p\n", xprt);
cancel_rearming_delayed_work(&transport->connect_worker); cancel_delayed_work_sync(&transport->connect_worker);
xs_close(xprt); xs_close(xprt);
xs_free_peer_addresses(xprt); xs_free_peer_addresses(xprt);