From: Nishanth Aravamudan <nacc@us.ibm.com>
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
(akpm: this patch relies on other stuff in -mm, please don't apply)
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/usb/class/audio.c | 12 ++++++++----
drivers/usb/host/ehci-hcd.c | 3 +--
drivers/usb/host/ohci-hcd.c | 3 +--
drivers/usb/serial/cypress_m8.c | 3 +--
drivers/usb/serial/pl2303.c | 3 +--
5 files changed, 12 insertions(+), 12 deletions(-)
diff -puN drivers/usb/class/audio.c~drivers-usb-fix-up-schedule_timeout-usage drivers/usb/class/audio.c
--- 25/drivers/usb/class/audio.c~drivers-usb-fix-up-schedule_timeout-usage Wed Aug 17 17:01:15 2005
+++ 25-akpm/drivers/usb/class/audio.c Wed Aug 17 17:01:15 2005
@@ -631,8 +631,10 @@ static void usbin_stop(struct usb_audiod
i = u->flags;
spin_unlock_irqrestore(&as->lock, flags);
while (i & (FLG_URB0RUNNING|FLG_URB1RUNNING|FLG_SYNC0RUNNING|FLG_SYNC1RUNNING)) {
- set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ if (notkilled)
+ schedule_timeout_interruptible(1);
+ else
+ schedule_timeout_uninterruptible(1);
spin_lock_irqsave(&as->lock, flags);
i = u->flags;
spin_unlock_irqrestore(&as->lock, flags);
@@ -1102,8 +1104,10 @@ static void usbout_stop(struct usb_audio
i = u->flags;
spin_unlock_irqrestore(&as->lock, flags);
while (i & (FLG_URB0RUNNING|FLG_URB1RUNNING|FLG_SYNC0RUNNING|FLG_SYNC1RUNNING)) {
- set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ if (not_killed)
+ schedule_timeout_interruptible(1);
+ else
+ schedule_timeout_uninterruptible(1);
spin_lock_irqsave(&as->lock, flags);
i = u->flags;
spin_unlock_irqrestore(&as->lock, flags);
diff -puN drivers/usb/host/ehci-hcd.c~drivers-usb-fix-up-schedule_timeout-usage drivers/usb/host/ehci-hcd.c
--- 25/drivers/usb/host/ehci-hcd.c~drivers-usb-fix-up-schedule_timeout-usage Wed Aug 17 17:01:15 2005
+++ 25-akpm/drivers/usb/host/ehci-hcd.c Wed Aug 17 17:01:15 2005
@@ -1126,8 +1126,7 @@ rescan:
case QH_STATE_UNLINK: /* wait for hw to finish? */
idle_timeout:
spin_unlock_irqrestore (&ehci->lock, flags);
- set_current_state (TASK_UNINTERRUPTIBLE);
- schedule_timeout (1);
+ schedule_timeout_uninterruptible(1);
goto rescan;
case QH_STATE_IDLE: /* fully unlinked */
if (list_empty (&qh->qtd_list)) {
diff -puN drivers/usb/host/ohci-hcd.c~drivers-usb-fix-up-schedule_timeout-usage drivers/usb/host/ohci-hcd.c
--- 25/drivers/usb/host/ohci-hcd.c~drivers-usb-fix-up-schedule_timeout-usage Wed Aug 17 17:01:15 2005
+++ 25-akpm/drivers/usb/host/ohci-hcd.c Wed Aug 17 17:01:15 2005
@@ -382,8 +382,7 @@ sanitize:
goto sanitize;
}
spin_unlock_irqrestore (&ohci->lock, flags);
- set_current_state (TASK_UNINTERRUPTIBLE);
- schedule_timeout (1);
+ schedule_timeout_uninterruptible(1);
goto rescan;
case ED_IDLE: /* fully unlinked */
if (list_empty (&ed->td_list)) {
diff -puN drivers/usb/serial/cypress_m8.c~drivers-usb-fix-up-schedule_timeout-usage drivers/usb/serial/cypress_m8.c
--- 25/drivers/usb/serial/cypress_m8.c~drivers-usb-fix-up-schedule_timeout-usage Wed Aug 17 17:01:15 2005
+++ 25-akpm/drivers/usb/serial/cypress_m8.c Wed Aug 17 17:01:15 2005
@@ -610,8 +610,7 @@ static void cypress_close(struct usb_ser
timeout = max((HZ*2560)/bps,HZ/10);
else
timeout = 2*HZ;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(timeout);
+ schedule_timeout_interruptible(timeout);
dbg("%s - stopping urbs", __FUNCTION__);
usb_kill_urb (port->interrupt_in_urb);
diff -puN drivers/usb/serial/pl2303.c~drivers-usb-fix-up-schedule_timeout-usage drivers/usb/serial/pl2303.c
--- 25/drivers/usb/serial/pl2303.c~drivers-usb-fix-up-schedule_timeout-usage Wed Aug 17 17:01:15 2005
+++ 25-akpm/drivers/usb/serial/pl2303.c Wed Aug 17 17:01:15 2005
@@ -652,8 +652,7 @@ static void pl2303_close (struct usb_ser
timeout = max((HZ*2560)/bps,HZ/10);
else
timeout = 2*HZ;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(timeout);
+ schedule_timeout_interruptible(timeout);
/* shutdown our urbs */
dbg("%s - shutting down urbs", __FUNCTION__);
_