Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

workqueue: deprecate flush[_delayed]_work_sync()

flush[_delayed]_work_sync() are now spurious. Mark them deprecated
and convert all users to flush[_delayed]_work().

If you're cc'd and wondering what's going on: Now all workqueues are
non-reentrant and the regular flushes guarantee that the work item is
not pending or running on any CPU on return, so there's no reason to
use the sync flushes at all and they're going away.

This patch doesn't make any functional difference.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Mattia Dongili <malattia@linux.it>
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: Bryan Wu <bryan.wu@canonical.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Avi Kivity <avi@redhat.com>

Tejun Heo 43829731 ae930e0f

+111 -111
+2 -2
arch/arm/mach-pxa/sharpsl_pm.c
··· 579 579 static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state) 580 580 { 581 581 sharpsl_pm.flags |= SHARPSL_SUSPENDED; 582 - flush_delayed_work_sync(&toggle_charger); 583 - flush_delayed_work_sync(&sharpsl_bat); 582 + flush_delayed_work(&toggle_charger); 583 + flush_delayed_work(&sharpsl_bat); 584 584 585 585 if (sharpsl_pm.charge_mode == CHRG_ON) 586 586 sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG;
+1 -1
arch/arm/plat-omap/mailbox.c
··· 310 310 omap_mbox_disable_irq(mbox, IRQ_RX); 311 311 free_irq(mbox->irq, mbox); 312 312 tasklet_kill(&mbox->txq->tasklet); 313 - flush_work_sync(&mbox->rxq->work); 313 + flush_work(&mbox->rxq->work); 314 314 mbox_queue_free(mbox->txq); 315 315 mbox_queue_free(mbox->rxq); 316 316 }
+1 -1
arch/sh/drivers/push-switch.c
··· 107 107 device_remove_file(&pdev->dev, &dev_attr_switch); 108 108 109 109 platform_set_drvdata(pdev, NULL); 110 - flush_work_sync(&psw->work); 110 + flush_work(&psw->work); 111 111 del_timer_sync(&psw->debounce); 112 112 free_irq(irq, pdev); 113 113
+2 -2
drivers/block/xen-blkfront.c
··· 670 670 spin_unlock_irqrestore(&info->io_lock, flags); 671 671 672 672 /* Flush gnttab callback work. Must be done with no locks held. */ 673 - flush_work_sync(&info->work); 673 + flush_work(&info->work); 674 674 675 675 del_gendisk(info->gd); 676 676 ··· 719 719 spin_unlock_irq(&info->io_lock); 720 720 721 721 /* Flush gnttab callback work. Must be done with no locks held. */ 722 - flush_work_sync(&info->work); 722 + flush_work(&info->work); 723 723 724 724 /* Free resources associated with old device channel. */ 725 725 if (info->ring_ref != GRANT_INVALID_REF) {
+1 -1
drivers/cdrom/gdrom.c
··· 840 840 841 841 static int __devexit remove_gdrom(struct platform_device *devptr) 842 842 { 843 - flush_work_sync(&work); 843 + flush_work(&work); 844 844 blk_cleanup_queue(gd.gdrom_rq); 845 845 free_irq(HW_EVENT_GDROM_CMD, &gd); 846 846 free_irq(HW_EVENT_GDROM_DMA, &gd);
+1 -1
drivers/char/sonypi.c
··· 1433 1433 sonypi_disable(); 1434 1434 1435 1435 synchronize_irq(sonypi_device.irq); 1436 - flush_work_sync(&sonypi_device.input_work); 1436 + flush_work(&sonypi_device.input_work); 1437 1437 1438 1438 if (useinput) { 1439 1439 input_unregister_device(sonypi_device.input_key_dev);
+2 -2
drivers/char/tpm/tpm.c
··· 1172 1172 struct tpm_chip *chip = file->private_data; 1173 1173 1174 1174 del_singleshot_timer_sync(&chip->user_read_timer); 1175 - flush_work_sync(&chip->work); 1175 + flush_work(&chip->work); 1176 1176 file->private_data = NULL; 1177 1177 atomic_set(&chip->data_pending, 0); 1178 1178 kfree(chip->data_buffer); ··· 1225 1225 int rc; 1226 1226 1227 1227 del_singleshot_timer_sync(&chip->user_read_timer); 1228 - flush_work_sync(&chip->work); 1228 + flush_work(&chip->work); 1229 1229 ret_size = atomic_read(&chip->data_pending); 1230 1230 atomic_set(&chip->data_pending, 0); 1231 1231 if (ret_size > 0) { /* relay data */
+1 -1
drivers/gpu/drm/exynos/exynos_drm_g2d.c
··· 908 908 /* FIXME: good range? */ 909 909 usleep_range(500, 1000); 910 910 911 - flush_work_sync(&g2d->runqueue_work); 911 + flush_work(&g2d->runqueue_work); 912 912 913 913 return 0; 914 914 }
+1 -1
drivers/gpu/drm/nouveau/nouveau_gpio.c
··· 302 302 spin_unlock_irqrestore(&pgpio->lock, flags); 303 303 304 304 list_for_each_entry_safe(isr, tmp, &tofree, head) { 305 - flush_work_sync(&isr->work); 305 + flush_work(&isr->work); 306 306 kfree(isr); 307 307 } 308 308 }
+1 -1
drivers/gpu/drm/radeon/radeon_irq_kms.c
··· 277 277 if (rdev->msi_enabled) 278 278 pci_disable_msi(rdev->pdev); 279 279 } 280 - flush_work_sync(&rdev->hotplug_work); 280 + flush_work(&rdev->hotplug_work); 281 281 } 282 282 283 283 /**
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
··· 594 594 par->dirty.active = false; 595 595 spin_unlock_irqrestore(&par->dirty.lock, flags); 596 596 597 - flush_delayed_work_sync(&info->deferred_work); 597 + flush_delayed_work(&info->deferred_work); 598 598 599 599 par->bo_ptr = NULL; 600 600 ttm_bo_kunmap(&par->map);
+1 -1
drivers/hid/hid-picolcd.c
··· 2737 2737 { 2738 2738 hid_unregister_driver(&picolcd_driver); 2739 2739 #ifdef CONFIG_HID_PICOLCD_FB 2740 - flush_work_sync(&picolcd_fb_cleanup); 2740 + flush_work(&picolcd_fb_cleanup); 2741 2741 WARN_ON(fb_pending); 2742 2742 #endif 2743 2743 }
+1 -1
drivers/input/touchscreen/wm831x-ts.c
··· 221 221 synchronize_irq(wm831x_ts->pd_irq); 222 222 223 223 /* Make sure the IRQ completion work is quiesced */ 224 - flush_work_sync(&wm831x_ts->pd_data_work); 224 + flush_work(&wm831x_ts->pd_data_work); 225 225 226 226 /* If we ended up with the pen down then make sure we revert back 227 227 * to pen detection state for the next time we start up.
+2 -2
drivers/isdn/mISDN/hwchannel.c
··· 116 116 } 117 117 skb_queue_purge(&ch->squeue); 118 118 skb_queue_purge(&ch->rqueue); 119 - flush_work_sync(&ch->workq); 119 + flush_work(&ch->workq); 120 120 return 0; 121 121 } 122 122 EXPORT_SYMBOL(mISDN_freedchannel); ··· 157 157 mISDN_clear_bchannel(ch); 158 158 skb_queue_purge(&ch->rqueue); 159 159 ch->rcount = 0; 160 - flush_work_sync(&ch->workq); 160 + flush_work(&ch->workq); 161 161 return 0; 162 162 } 163 163 EXPORT_SYMBOL(mISDN_freebchannel);
+3 -3
drivers/leds/leds-lm3533.c
··· 737 737 sysfs_remove_group(&led->cdev.dev->kobj, &lm3533_led_attribute_group); 738 738 err_unregister: 739 739 led_classdev_unregister(&led->cdev); 740 - flush_work_sync(&led->work); 740 + flush_work(&led->work); 741 741 742 742 return ret; 743 743 } ··· 751 751 lm3533_ctrlbank_disable(&led->cb); 752 752 sysfs_remove_group(&led->cdev.dev->kobj, &lm3533_led_attribute_group); 753 753 led_classdev_unregister(&led->cdev); 754 - flush_work_sync(&led->work); 754 + flush_work(&led->work); 755 755 756 756 return 0; 757 757 } ··· 765 765 766 766 lm3533_ctrlbank_disable(&led->cb); 767 767 lm3533_led_set(&led->cdev, LED_OFF); /* disable blink */ 768 - flush_work_sync(&led->work); 768 + flush_work(&led->work); 769 769 } 770 770 771 771 static struct platform_driver lm3533_led_driver = {
+1 -1
drivers/leds/leds-lp8788.c
··· 172 172 struct lp8788_led *led = platform_get_drvdata(pdev); 173 173 174 174 led_classdev_unregister(&led->led_dev); 175 - flush_work_sync(&led->work); 175 + flush_work(&led->work); 176 176 177 177 return 0; 178 178 }
+1 -1
drivers/leds/leds-wm8350.c
··· 275 275 struct wm8350_led *led = platform_get_drvdata(pdev); 276 276 277 277 led_classdev_unregister(&led->cdev); 278 - flush_work_sync(&led->work); 278 + flush_work(&led->work); 279 279 wm8350_led_disable(led); 280 280 regulator_put(led->dcdc); 281 281 regulator_put(led->isink);
+1 -1
drivers/macintosh/ams/ams-core.c
··· 226 226 * We do this after ams_info.exit(), because an interrupt might 227 227 * have arrived before disabling them. 228 228 */ 229 - flush_work_sync(&ams_info.worker); 229 + flush_work(&ams_info.worker); 230 230 231 231 /* Remove device */ 232 232 of_device_unregister(ams_info.of_dev);
+1 -1
drivers/md/dm-mpath.c
··· 944 944 flush_workqueue(kmpath_handlerd); 945 945 multipath_wait_for_pg_init_completion(m); 946 946 flush_workqueue(kmultipathd); 947 - flush_work_sync(&m->trigger_event); 947 + flush_work(&m->trigger_event); 948 948 } 949 949 950 950 static void multipath_dtr(struct dm_target *ti)
+1 -1
drivers/md/dm-raid1.c
··· 1146 1146 1147 1147 del_timer_sync(&ms->timer); 1148 1148 flush_workqueue(ms->kmirrord_wq); 1149 - flush_work_sync(&ms->trigger_event); 1149 + flush_work(&ms->trigger_event); 1150 1150 dm_kcopyd_client_destroy(ms->kcopyd_client); 1151 1151 destroy_workqueue(ms->kmirrord_wq); 1152 1152 free_context(ms, ti, ms->nr_mirrors);
+1 -1
drivers/md/dm-stripe.c
··· 199 199 for (i = 0; i < sc->stripes; i++) 200 200 dm_put_device(ti, sc->stripe[i].dev); 201 201 202 - flush_work_sync(&sc->trigger_event); 202 + flush_work(&sc->trigger_event); 203 203 kfree(sc); 204 204 } 205 205
+2 -2
drivers/media/dvb/dvb-core/dvb_net.c
··· 1329 1329 return -EBUSY; 1330 1330 1331 1331 dvb_net_stop(net); 1332 - flush_work_sync(&priv->set_multicast_list_wq); 1333 - flush_work_sync(&priv->restart_net_feed_wq); 1332 + flush_work(&priv->set_multicast_list_wq); 1333 + flush_work(&priv->restart_net_feed_wq); 1334 1334 printk("dvb_net: removed network interface %s\n", net->name); 1335 1335 unregister_netdev(net); 1336 1336 dvbnet->state[num]=0;
+1 -1
drivers/media/dvb/mantis/mantis_evm.c
··· 111 111 struct mantis_pci *mantis = ca->ca_priv; 112 112 113 113 dprintk(MANTIS_DEBUG, 1, "Mantis Host I/F Event manager exiting"); 114 - flush_work_sync(&ca->hif_evm_work); 114 + flush_work(&ca->hif_evm_work); 115 115 mantis_hif_exit(ca); 116 116 mantis_pcmcia_exit(ca); 117 117 }
+1 -1
drivers/media/dvb/mantis/mantis_uart.c
··· 183 183 { 184 184 /* disable interrupt */ 185 185 mmwrite(mmread(MANTIS_UART_CTL) & 0xffef, MANTIS_UART_CTL); 186 - flush_work_sync(&mantis->uart_work); 186 + flush_work(&mantis->uart_work); 187 187 } 188 188 EXPORT_SYMBOL_GPL(mantis_uart_exit);
+1 -1
drivers/media/video/bt8xx/bttv-driver.c
··· 196 196 197 197 static void flush_request_modules(struct bttv *dev) 198 198 { 199 - flush_work_sync(&dev->request_module_wk); 199 + flush_work(&dev->request_module_wk); 200 200 } 201 201 #else 202 202 #define request_modules(dev)
+1 -1
drivers/media/video/cx18/cx18-driver.c
··· 272 272 273 273 static void flush_request_modules(struct cx18 *dev) 274 274 { 275 - flush_work_sync(&dev->request_module_wk); 275 + flush_work(&dev->request_module_wk); 276 276 } 277 277 #else 278 278 #define request_modules(dev)
+1 -1
drivers/media/video/cx231xx/cx231xx-cards.c
··· 1002 1002 1003 1003 static void flush_request_modules(struct cx231xx *dev) 1004 1004 { 1005 - flush_work_sync(&dev->request_module_wk); 1005 + flush_work(&dev->request_module_wk); 1006 1006 } 1007 1007 #else 1008 1008 #define request_modules(dev)
+3 -3
drivers/media/video/cx23885/cx23885-input.c
··· 231 231 v4l2_subdev_call(dev->sd_ir, ir, rx_s_parameters, &params); 232 232 v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params); 233 233 } 234 - flush_work_sync(&dev->cx25840_work); 235 - flush_work_sync(&dev->ir_rx_work); 236 - flush_work_sync(&dev->ir_tx_work); 234 + flush_work(&dev->cx25840_work); 235 + flush_work(&dev->ir_rx_work); 236 + flush_work(&dev->ir_tx_work); 237 237 } 238 238 239 239 static void cx23885_input_ir_close(struct rc_dev *rc)
+1 -1
drivers/media/video/cx88/cx88-mpeg.c
··· 70 70 71 71 static void flush_request_modules(struct cx8802_dev *dev) 72 72 { 73 - flush_work_sync(&dev->request_module_wk); 73 + flush_work(&dev->request_module_wk); 74 74 } 75 75 #else 76 76 #define request_modules(dev)
+1 -1
drivers/media/video/em28xx/em28xx-cards.c
··· 2900 2900 2901 2901 static void flush_request_modules(struct em28xx *dev) 2902 2902 { 2903 - flush_work_sync(&dev->request_module_wk); 2903 + flush_work(&dev->request_module_wk); 2904 2904 } 2905 2905 #else 2906 2906 #define request_modules(dev)
+3 -3
drivers/media/video/omap24xxcam.c
··· 1198 1198 1199 1199 atomic_inc(&cam->reset_disable); 1200 1200 1201 - flush_work_sync(&cam->sensor_reset_work); 1201 + flush_work(&cam->sensor_reset_work); 1202 1202 1203 1203 rval = videobuf_streamoff(q); 1204 1204 if (!rval) { ··· 1512 1512 1513 1513 atomic_inc(&cam->reset_disable); 1514 1514 1515 - flush_work_sync(&cam->sensor_reset_work); 1515 + flush_work(&cam->sensor_reset_work); 1516 1516 1517 1517 /* stop streaming capture */ 1518 1518 videobuf_streamoff(&fh->vbq); ··· 1536 1536 * not be scheduled anymore since streaming is already 1537 1537 * disabled.) 1538 1538 */ 1539 - flush_work_sync(&cam->sensor_reset_work); 1539 + flush_work(&cam->sensor_reset_work); 1540 1540 1541 1541 mutex_lock(&cam->mutex); 1542 1542 if (atomic_dec_return(&cam->users) == 0) {
+1 -1
drivers/media/video/saa7134/saa7134-core.c
··· 170 170 171 171 static void flush_request_submodules(struct saa7134_dev *dev) 172 172 { 173 - flush_work_sync(&dev->request_module_wk); 173 + flush_work(&dev->request_module_wk); 174 174 } 175 175 176 176 #else
+1 -1
drivers/media/video/saa7134/saa7134-empress.c
··· 556 556 557 557 if (NULL == dev->empress_dev) 558 558 return 0; 559 - flush_work_sync(&dev->empress_workqueue); 559 + flush_work(&dev->empress_workqueue); 560 560 video_unregister_device(dev->empress_dev); 561 561 dev->empress_dev = NULL; 562 562 return 0;
+1 -1
drivers/media/video/tm6000/tm6000-cards.c
··· 1074 1074 1075 1075 static void flush_request_modules(struct tm6000_core *dev) 1076 1076 { 1077 - flush_work_sync(&dev->request_module_wk); 1077 + flush_work(&dev->request_module_wk); 1078 1078 } 1079 1079 #else 1080 1080 #define request_modules(dev)
+2 -2
drivers/mfd/menelaus.c
··· 1259 1259 return 0; 1260 1260 fail2: 1261 1261 free_irq(client->irq, menelaus); 1262 - flush_work_sync(&menelaus->work); 1262 + flush_work(&menelaus->work); 1263 1263 fail1: 1264 1264 kfree(menelaus); 1265 1265 return err; ··· 1270 1270 struct menelaus_chip *menelaus = i2c_get_clientdata(client); 1271 1271 1272 1272 free_irq(client->irq, menelaus); 1273 - flush_work_sync(&menelaus->work); 1273 + flush_work(&menelaus->work); 1274 1274 kfree(menelaus); 1275 1275 the_menelaus = NULL; 1276 1276 return 0;
+1 -1
drivers/misc/ioc4.c
··· 487 487 ioc4_exit(void) 488 488 { 489 489 /* Ensure ioc4_load_modules() has completed before exiting */ 490 - flush_work_sync(&ioc4_load_modules_work); 490 + flush_work(&ioc4_load_modules_work); 491 491 pci_unregister_driver(&ioc4_driver); 492 492 } 493 493
+2 -2
drivers/mtd/mtdoops.c
··· 387 387 printk(KERN_WARNING "mtdoops: could not unregister kmsg_dumper\n"); 388 388 389 389 cxt->mtd = NULL; 390 - flush_work_sync(&cxt->work_erase); 391 - flush_work_sync(&cxt->work_write); 390 + flush_work(&cxt->work_erase); 391 + flush_work(&cxt->work_write); 392 392 } 393 393 394 394
+1 -1
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
··· 1394 1394 sysfs_remove_group(&tdev->lldev->dev.kobj, &offload_attr_group); 1395 1395 1396 1396 /* Flush work scheduled while releasing TIDs */ 1397 - flush_work_sync(&td->tid_release_task); 1397 + flush_work(&td->tid_release_task); 1398 1398 1399 1399 tdev->lldev = NULL; 1400 1400 cxgb3_set_dummy_ops(tdev);
+1 -1
drivers/net/ethernet/neterion/vxge/vxge-main.c
··· 3521 3521 3522 3522 strncpy(buf, dev->name, IFNAMSIZ); 3523 3523 3524 - flush_work_sync(&vdev->reset_task); 3524 + flush_work(&vdev->reset_task); 3525 3525 3526 3526 /* in 2.6 will call stop() if device is up */ 3527 3527 unregister_netdev(dev);
+1 -1
drivers/net/ethernet/sun/cassini.c
··· 3890 3890 schedule_work(&cp->reset_task); 3891 3891 #endif 3892 3892 3893 - flush_work_sync(&cp->reset_task); 3893 + flush_work(&cp->reset_task); 3894 3894 return 0; 3895 3895 } 3896 3896
+1 -1
drivers/net/ethernet/sun/niu.c
··· 9932 9932 if (!netif_running(dev)) 9933 9933 return 0; 9934 9934 9935 - flush_work_sync(&np->reset_task); 9935 + flush_work(&np->reset_task); 9936 9936 niu_netif_stop(np); 9937 9937 9938 9938 del_timer_sync(&np->timer);
+2 -2
drivers/net/wireless/hostap/hostap_ap.c
··· 860 860 return; 861 861 } 862 862 863 - flush_work_sync(&ap->add_sta_proc_queue); 863 + flush_work(&ap->add_sta_proc_queue); 864 864 865 865 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT 866 - flush_work_sync(&ap->wds_oper_queue); 866 + flush_work(&ap->wds_oper_queue); 867 867 if (ap->crypt) 868 868 ap->crypt->deinit(ap->crypt_priv); 869 869 ap->crypt = ap->crypt_priv = NULL;
+5 -5
drivers/net/wireless/hostap/hostap_hw.c
··· 3311 3311 3312 3312 unregister_netdev(local->dev); 3313 3313 3314 - flush_work_sync(&local->reset_queue); 3315 - flush_work_sync(&local->set_multicast_list_queue); 3316 - flush_work_sync(&local->set_tim_queue); 3314 + flush_work(&local->reset_queue); 3315 + flush_work(&local->set_multicast_list_queue); 3316 + flush_work(&local->set_tim_queue); 3317 3317 #ifndef PRISM2_NO_STATION_MODES 3318 - flush_work_sync(&local->info_queue); 3318 + flush_work(&local->info_queue); 3319 3319 #endif 3320 - flush_work_sync(&local->comms_qual_update); 3320 + flush_work(&local->comms_qual_update); 3321 3321 3322 3322 lib80211_crypt_info_free(&local->crypt_info); 3323 3323
+1 -1
drivers/power/collie_battery.c
··· 290 290 static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state) 291 291 { 292 292 /* flush all pending status updates */ 293 - flush_work_sync(&bat_work); 293 + flush_work(&bat_work); 294 294 return 0; 295 295 } 296 296
+1 -1
drivers/power/tosa_battery.c
··· 327 327 static int tosa_bat_suspend(struct platform_device *dev, pm_message_t state) 328 328 { 329 329 /* flush all pending status updates */ 330 - flush_work_sync(&bat_work); 330 + flush_work(&bat_work); 331 331 return 0; 332 332 } 333 333
+1 -1
drivers/power/wm97xx_battery.c
··· 146 146 #ifdef CONFIG_PM 147 147 static int wm97xx_bat_suspend(struct device *dev) 148 148 { 149 - flush_work_sync(&bat_work); 149 + flush_work(&bat_work); 150 150 return 0; 151 151 } 152 152
+1 -1
drivers/power/z2_battery.c
··· 276 276 struct i2c_client *client = to_i2c_client(dev); 277 277 struct z2_charger *charger = i2c_get_clientdata(client); 278 278 279 - flush_work_sync(&charger->bat_work); 279 + flush_work(&charger->bat_work); 280 280 return 0; 281 281 } 282 282
+1 -1
drivers/regulator/core.c
··· 3335 3335 regulator_put(rdev->supply); 3336 3336 mutex_lock(&regulator_list_mutex); 3337 3337 debugfs_remove_recursive(rdev->debugfs); 3338 - flush_work_sync(&rdev->disable_work.work); 3338 + flush_work(&rdev->disable_work.work); 3339 3339 WARN_ON(rdev->open_count); 3340 3340 unset_regulator_supplies(rdev); 3341 3341 list_del(&rdev->list);
+2 -2
drivers/scsi/arcmsr/arcmsr_hba.c
··· 999 999 int poll_count = 0; 1000 1000 arcmsr_free_sysfs_attr(acb); 1001 1001 scsi_remove_host(host); 1002 - flush_work_sync(&acb->arcmsr_do_message_isr_bh); 1002 + flush_work(&acb->arcmsr_do_message_isr_bh); 1003 1003 del_timer_sync(&acb->eternal_timer); 1004 1004 arcmsr_disable_outbound_ints(acb); 1005 1005 arcmsr_stop_adapter_bgrb(acb); ··· 1045 1045 (struct AdapterControlBlock *)host->hostdata; 1046 1046 del_timer_sync(&acb->eternal_timer); 1047 1047 arcmsr_disable_outbound_ints(acb); 1048 - flush_work_sync(&acb->arcmsr_do_message_isr_bh); 1048 + flush_work(&acb->arcmsr_do_message_isr_bh); 1049 1049 arcmsr_stop_adapter_bgrb(acb); 1050 1050 arcmsr_flush_adapter_cache(acb); 1051 1051 }
+1 -1
drivers/scsi/ipr.c
··· 9020 9020 9021 9021 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); 9022 9022 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 9023 - flush_work_sync(&ioa_cfg->work_q); 9023 + flush_work(&ioa_cfg->work_q); 9024 9024 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 9025 9025 9026 9026 spin_lock(&ipr_driver_lock);
+1 -1
drivers/scsi/pmcraid.c
··· 5459 5459 pmcraid_shutdown(pdev); 5460 5460 5461 5461 pmcraid_disable_interrupts(pinstance, ~0); 5462 - flush_work_sync(&pinstance->worker_q); 5462 + flush_work(&pinstance->worker_q); 5463 5463 5464 5464 pmcraid_kill_tasklets(pinstance); 5465 5465 pmcraid_unregister_interrupt_handler(pinstance);
+1 -1
drivers/scsi/qla2xxx/qla_target.c
··· 969 969 spin_unlock_irqrestore(&ha->hardware_lock, flags); 970 970 mutex_unlock(&ha->tgt.tgt_mutex); 971 971 972 - flush_delayed_work_sync(&tgt->sess_del_work); 972 + flush_delayed_work(&tgt->sess_del_work); 973 973 974 974 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf009, 975 975 "Waiting for sess works (tgt %p)", tgt);
+1 -1
drivers/tty/hvc/hvsi.c
··· 765 765 766 766 /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */ 767 767 cancel_delayed_work_sync(&hp->writer); 768 - flush_work_sync(&hp->handshaker); 768 + flush_work(&hp->handshaker); 769 769 770 770 /* 771 771 * it's also possible that our timeout expired and hvsi_write_worker
+1 -1
drivers/tty/ipwireless/hardware.c
··· 1729 1729 1730 1730 ipwireless_stop_interrupts(hw); 1731 1731 1732 - flush_work_sync(&hw->work_rx); 1732 + flush_work(&hw->work_rx); 1733 1733 1734 1734 for (i = 0; i < NL_NUM_OF_ADDRESSES; i++) 1735 1735 if (hw->packet_assembler[i] != NULL)
+2 -2
drivers/tty/ipwireless/network.c
··· 430 430 network->shutting_down = 1; 431 431 432 432 ipwireless_ppp_close(network); 433 - flush_work_sync(&network->work_go_online); 434 - flush_work_sync(&network->work_go_offline); 433 + flush_work(&network->work_go_online); 434 + flush_work(&network->work_go_offline); 435 435 436 436 ipwireless_stop_interrupts(network->hardware); 437 437 ipwireless_associate_network(network->hardware, NULL);
+1 -1
drivers/tty/serial/kgdboc.c
··· 122 122 i--; 123 123 } 124 124 } 125 - flush_work_sync(&kgdboc_restore_input_work); 125 + flush_work(&kgdboc_restore_input_work); 126 126 } 127 127 #else /* ! CONFIG_KDB_KEYBOARD */ 128 128 #define kgdboc_register_kbd(x) 0
+1 -1
drivers/tty/serial/omap-serial.c
··· 1205 1205 1206 1206 if (up) { 1207 1207 uart_suspend_port(&serial_omap_reg, &up->port); 1208 - flush_work_sync(&up->qos_work); 1208 + flush_work(&up->qos_work); 1209 1209 } 1210 1210 1211 1211 return 0;
+3 -3
drivers/tty/tty_ldisc.c
··· 523 523 */ 524 524 static void tty_ldisc_flush_works(struct tty_struct *tty) 525 525 { 526 - flush_work_sync(&tty->hangup_work); 527 - flush_work_sync(&tty->SAK_work); 528 - flush_work_sync(&tty->buf.work); 526 + flush_work(&tty->hangup_work); 527 + flush_work(&tty->SAK_work); 528 + flush_work(&tty->buf.work); 529 529 } 530 530 531 531 /**
+1 -1
drivers/usb/atm/speedtch.c
··· 718 718 del_timer_sync(&instance->resubmit_timer); 719 719 usb_free_urb(int_urb); 720 720 721 - flush_work_sync(&instance->status_check_work); 721 + flush_work(&instance->status_check_work); 722 722 } 723 723 724 724 static int speedtch_pre_reset(struct usb_interface *intf)
+1 -1
drivers/usb/atm/ueagle-atm.c
··· 2234 2234 usb_free_urb(sc->urb_int); 2235 2235 2236 2236 /* flush the work item, when no one can schedule it */ 2237 - flush_work_sync(&sc->task); 2237 + flush_work(&sc->task); 2238 2238 2239 2239 release_firmware(sc->dsp_firm); 2240 2240 uea_leaves(INS_TO_USBDEV(sc));
+1 -1
drivers/usb/gadget/u_ether.c
··· 834 834 return; 835 835 836 836 unregister_netdev(the_dev->net); 837 - flush_work_sync(&the_dev->work); 837 + flush_work(&the_dev->work); 838 838 free_netdev(the_dev->net); 839 839 840 840 the_dev = NULL;
+1 -1
drivers/usb/host/ohci-hcd.c
··· 893 893 ohci_dump (ohci, 1); 894 894 895 895 if (quirk_nec(ohci)) 896 - flush_work_sync(&ohci->nec_work); 896 + flush_work(&ohci->nec_work); 897 897 898 898 ohci_usb_reset (ohci); 899 899 ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
+1 -1
drivers/usb/otg/isp1301_omap.c
··· 1230 1230 isp->timer.data = 0; 1231 1231 set_bit(WORK_STOP, &isp->todo); 1232 1232 del_timer_sync(&isp->timer); 1233 - flush_work_sync(&isp->work); 1233 + flush_work(&isp->work); 1234 1234 1235 1235 put_device(&i2c->dev); 1236 1236 the_transceiver = NULL;
+1 -1
fs/affs/super.c
··· 551 551 return -EINVAL; 552 552 } 553 553 554 - flush_delayed_work_sync(&sbi->sb_work); 554 + flush_delayed_work(&sbi->sb_work); 555 555 replace_mount_options(sb, new_opts); 556 556 557 557 sbi->s_flags = mount_flags;
+1 -1
fs/gfs2/lock_dlm.c
··· 1289 1289 spin_lock(&ls->ls_recover_spin); 1290 1290 set_bit(DFL_UNMOUNT, &ls->ls_recover_flags); 1291 1291 spin_unlock(&ls->ls_recover_spin); 1292 - flush_delayed_work_sync(&sdp->sd_control_work); 1292 + flush_delayed_work(&sdp->sd_control_work); 1293 1293 1294 1294 /* mounted_lock and control_lock will be purged in dlm recovery */ 1295 1295 release:
+1 -1
fs/gfs2/super.c
··· 1572 1572 clear_inode(inode); 1573 1573 gfs2_dir_hash_inval(ip); 1574 1574 ip->i_gl->gl_object = NULL; 1575 - flush_delayed_work_sync(&ip->i_gl->gl_work); 1575 + flush_delayed_work(&ip->i_gl->gl_work); 1576 1576 gfs2_glock_add_to_lru(ip->i_gl); 1577 1577 gfs2_glock_put(ip->i_gl); 1578 1578 ip->i_gl = NULL;
+1 -1
fs/hfs/inode.c
··· 644 644 645 645 /* sync the superblock to buffers */ 646 646 sb = inode->i_sb; 647 - flush_delayed_work_sync(&HFS_SB(sb)->mdb_work); 647 + flush_delayed_work(&HFS_SB(sb)->mdb_work); 648 648 /* .. finally sync the buffers to disk */ 649 649 err = sync_blockdev(sb->s_bdev); 650 650 if (!ret)
+3 -3
fs/ncpfs/inode.c
··· 314 314 release_sock(sk); 315 315 del_timer_sync(&server->timeout_tm); 316 316 317 - flush_work_sync(&server->rcv.tq); 317 + flush_work(&server->rcv.tq); 318 318 if (sk->sk_socket->type == SOCK_STREAM) 319 - flush_work_sync(&server->tx.tq); 319 + flush_work(&server->tx.tq); 320 320 else 321 - flush_work_sync(&server->timeout_tq); 321 + flush_work(&server->timeout_tq); 322 322 } 323 323 324 324 static int ncp_show_options(struct seq_file *seq, struct dentry *root)
+1 -1
fs/ocfs2/cluster/quorum.c
··· 327 327 { 328 328 struct o2quo_state *qs = &o2quo_state; 329 329 330 - flush_work_sync(&qs->qs_work); 330 + flush_work(&qs->qs_work); 331 331 }
+1 -1
fs/xfs/xfs_super.c
··· 953 953 * We schedule xfssyncd now (now that the disk is 954 954 * active) instead of later (when it might not be). 955 955 */ 956 - flush_delayed_work_sync(&mp->m_sync_work); 956 + flush_delayed_work(&mp->m_sync_work); 957 957 } 958 958 959 959 return 0;
+1 -1
fs/xfs/xfs_sync.c
··· 475 475 struct xfs_mount *mp = ip->i_mount; 476 476 477 477 queue_work(xfs_syncd_wq, &mp->m_flush_work); 478 - flush_work_sync(&mp->m_flush_work); 478 + flush_work(&mp->m_flush_work); 479 479 } 480 480 481 481 STATIC void
+2 -2
include/linux/workqueue.h
··· 460 460 } 461 461 462 462 /* used to be different but now identical to flush_work(), deprecated */ 463 - static inline bool flush_work_sync(struct work_struct *work) 463 + static inline bool __deprecated flush_work_sync(struct work_struct *work) 464 464 { 465 465 return flush_work(work); 466 466 } 467 467 468 468 /* used to be different but now identical to flush_delayed_work(), deprecated */ 469 - static inline bool flush_delayed_work_sync(struct delayed_work *dwork) 469 + static inline bool __deprecated flush_delayed_work_sync(struct delayed_work *dwork) 470 470 { 471 471 return flush_delayed_work(dwork); 472 472 }
+1 -1
net/9p/trans_fd.c
··· 1083 1083 1084 1084 void p9_trans_fd_exit(void) 1085 1085 { 1086 - flush_work_sync(&p9_poll_work); 1086 + flush_work(&p9_poll_work); 1087 1087 v9fs_unregister_trans(&p9_tcp_trans); 1088 1088 v9fs_unregister_trans(&p9_unix_trans); 1089 1089 v9fs_unregister_trans(&p9_fd_trans);
+1 -1
net/dsa/dsa.c
··· 370 370 if (dst->link_poll_needed) 371 371 del_timer_sync(&dst->link_poll_timer); 372 372 373 - flush_work_sync(&dst->link_poll_work); 373 + flush_work(&dst->link_poll_work); 374 374 375 375 for (i = 0; i < dst->pd->nr_chips; i++) { 376 376 struct dsa_switch *ds = dst->ds[i];
+1 -1
sound/i2c/other/ak4113.c
··· 141 141 { 142 142 chip->init = 1; 143 143 mb(); 144 - flush_delayed_work_sync(&chip->work); 144 + flush_delayed_work(&chip->work); 145 145 ak4113_init_regs(chip); 146 146 /* bring up statistics / event queing */ 147 147 chip->init = 0;
+1 -1
sound/i2c/other/ak4114.c
··· 154 154 { 155 155 chip->init = 1; 156 156 mb(); 157 - flush_delayed_work_sync(&chip->work); 157 + flush_delayed_work(&chip->work); 158 158 ak4114_init_regs(chip); 159 159 /* bring up statistics / event queing */ 160 160 chip->init = 0;
+4 -4
sound/pci/oxygen/oxygen_lib.c
··· 573 573 oxygen_shutdown(chip); 574 574 if (chip->irq >= 0) 575 575 free_irq(chip->irq, chip); 576 - flush_work_sync(&chip->spdif_input_bits_work); 577 - flush_work_sync(&chip->gpio_work); 576 + flush_work(&chip->spdif_input_bits_work); 577 + flush_work(&chip->gpio_work); 578 578 chip->model.cleanup(chip); 579 579 kfree(chip->model_data); 580 580 mutex_destroy(&chip->mutex); ··· 751 751 spin_unlock_irq(&chip->reg_lock); 752 752 753 753 synchronize_irq(chip->irq); 754 - flush_work_sync(&chip->spdif_input_bits_work); 755 - flush_work_sync(&chip->gpio_work); 754 + flush_work(&chip->spdif_input_bits_work); 755 + flush_work(&chip->gpio_work); 756 756 chip->interrupt_mask = saved_interrupt_mask; 757 757 758 758 pci_disable_device(pci);
+1 -1
sound/soc/codecs/wm8350.c
··· 1601 1601 1602 1602 /* if there was any work waiting then we run it now and 1603 1603 * wait for its completion */ 1604 - flush_delayed_work_sync(&codec->dapm.delayed_work); 1604 + flush_delayed_work(&codec->dapm.delayed_work); 1605 1605 1606 1606 wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF); 1607 1607
+1 -1
sound/soc/codecs/wm8753.c
··· 1509 1509 /* power down chip */ 1510 1510 static int wm8753_remove(struct snd_soc_codec *codec) 1511 1511 { 1512 - flush_delayed_work_sync(&codec->dapm.delayed_work); 1512 + flush_delayed_work(&codec->dapm.delayed_work); 1513 1513 wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); 1514 1514 1515 1515 return 0;
+3 -3
sound/soc/soc-core.c
··· 591 591 592 592 /* close any waiting streams and save state */ 593 593 for (i = 0; i < card->num_rtd; i++) { 594 - flush_delayed_work_sync(&card->rtd[i].delayed_work); 594 + flush_delayed_work(&card->rtd[i].delayed_work); 595 595 card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level; 596 596 } 597 597 ··· 1846 1846 /* make sure any delayed work runs */ 1847 1847 for (i = 0; i < card->num_rtd; i++) { 1848 1848 struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; 1849 - flush_delayed_work_sync(&rtd->delayed_work); 1849 + flush_delayed_work(&rtd->delayed_work); 1850 1850 } 1851 1851 1852 1852 /* remove auxiliary devices */ ··· 1890 1890 * now, we're shutting down so no imminent restart. */ 1891 1891 for (i = 0; i < card->num_rtd; i++) { 1892 1892 struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; 1893 - flush_delayed_work_sync(&rtd->delayed_work); 1893 + flush_delayed_work(&rtd->delayed_work); 1894 1894 } 1895 1895 1896 1896 snd_soc_dapm_shutdown(card);
+1 -1
virt/kvm/eventfd.c
··· 90 90 * We know no new events will be scheduled at this point, so block 91 91 * until all previously outstanding events have completed 92 92 */ 93 - flush_work_sync(&irqfd->inject); 93 + flush_work(&irqfd->inject); 94 94 95 95 /* 96 96 * It is now safe to release the object's resources