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

Commit 23d69b09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
parents e744070f 569ff2de

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -566,3 +566,13 @@ Why: This field is deprecated. I2C device drivers shouldn't change their 
Who:	Jean Delvare <khali@linux-fr.org>



----------------------------



What:	cancel_rearming_delayed_work[queue]()

When:	2.6.39



Why:	The functions have been superceded by cancel_delayed_work_sync()

	quite some time ago.  The conversion is trivial and there is no

	in-kernel user left.

Who:	Tejun Heo <tj@kernel.org>



----------------------------

arch/arm/mach-pxa/sharpsl_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -579,7 +579,8 @@ static int sharpsl_ac_check(void) 
static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state)

{

	sharpsl_pm.flags |= SHARPSL_SUSPENDED;

	flush_scheduled_work();

	flush_delayed_work_sync(&toggle_charger);

	flush_delayed_work_sync(&sharpsl_bat);



	if (sharpsl_pm.charge_mode == CHRG_ON)

		sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG;

arch/sh/drivers/push-switch.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int switch_drv_remove(struct platform_device *pdev) 
		device_remove_file(&pdev->dev, &dev_attr_switch);



	platform_set_drvdata(pdev, NULL);

	flush_scheduled_work();

	flush_work_sync(&psw->work);

	del_timer_sync(&psw->debounce);

	free_irq(irq, pdev);

drivers/ata/libata-core.c

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