Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe2c511 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatar"David S. Miller" <davem@davemloft.net>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarEvgeniy 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
parent 2d64672e

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/ata/libata-sff.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/macintosh/rack-meter.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/media/dvb/dvb-usb/dvb-usb-remote.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/em28xx/em28xx-input.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}