diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 10:14:20 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 10:14:20 -0500 |
commit | 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 (patch) | |
tree | 124784a459d055a97506b37ce3d51e9713485922 /drivers/usb/host/ohci-hcd.c | |
parent | 37c95bfe944babae817bfcf02c996729c9a3335d (diff) |
usb: don't use flush_scheduled_work()
flush_scheduled_work() is being deprecated. Directly flush or cancel
work items instead.
* u_ether, isp1301_omap, speedtch conversions are straight-forward.
* ochi-hcd should only flush when quirk_nec() is true as otherwise the
work wouldn't have been initialized.
* In oti6858, cancel_delayed_work() + flush_scheduled_work() ->
cancel_delayed_work_sync().
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Duncan Sands <duncan.sands@free.fr>
Cc: linux-usb@vger.kernel.org
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 5179acb7aa2..bd5eff77d0c 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -901,7 +901,8 @@ static void ohci_stop (struct usb_hcd *hcd) | |||
901 | 901 | ||
902 | ohci_dump (ohci, 1); | 902 | ohci_dump (ohci, 1); |
903 | 903 | ||
904 | flush_scheduled_work(); | 904 | if (quirk_nec(ohci)) |
905 | flush_work_sync(&ohci->nec_work); | ||
905 | 906 | ||
906 | ohci_usb_reset (ohci); | 907 | ohci_usb_reset (ohci); |
907 | ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable); | 908 | ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable); |