misc hcd cleanup

This is minor cleanup; pulls #includes out of files
that aren't intended to compile by themselves.

ehci bandwidth recording

Here's a minor update to the EHCI interrupt scheduler,
recording the bandwidth used by an URB for usbfs.

diff --git a/drivers/usb/hcd/ehci-hcd.c b/drivers/usb/hcd/ehci-hcd.c
index e6618253066aed0bc196b60cd595e2f234eb4828..2ab1e0c78c6f44aea7cf1801d4eed1a8dea273a5 100644 (file)
--- a/drivers/usb/hcd/ehci-hcd.c
+++ b/drivers/usb/hcd/ehci-hcd.c
@@ -44,6 +44,7 @@
 #include <linux/usb.h>
 #include "../hcd.h"
 
+#include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>

diff --git a/drivers/usb/hcd/ehci-hub.c b/drivers/usb/hcd/ehci-hub.c
index 4a789564506da331e97473fc4ef0211716e6830e..798fd6066430b5827be70c35250871fe8a7e8104 100644 (file)
--- a/drivers/usb/hcd/ehci-hub.c
+++ b/drivers/usb/hcd/ehci-hub.c
@@ -18,8 +18,6 @@
 
 /* this file is part of ehci-hcd.c */
 
-#include <asm/byteorder.h>
-
 /*-------------------------------------------------------------------------*/
 
 /*

diff --git a/drivers/usb/hcd/ehci-mem.c b/drivers/usb/hcd/ehci-mem.c
index 94fd675e51527e06fb4cb64d2b50d81354d5f233..b2ee617c6c8b9063b6d735eb88dc15147ec924a1 100644 (file)
--- a/drivers/usb/hcd/ehci-mem.c
+++ b/drivers/usb/hcd/ehci-mem.c
@@ -18,8 +18,6 @@
 
 /* this file is part of ehci-hcd.c */
 
-#include <asm/byteorder.h>
-
 /*-------------------------------------------------------------------------*/
 
 /*

diff --git a/drivers/usb/hcd/ehci-q.c b/drivers/usb/hcd/ehci-q.c
index 1837e8b2c115e7afb82278c9781897a85942f374..df6c07d3d6feef35723714b47ec8c9ab12b1ef51 100644 (file)
--- a/drivers/usb/hcd/ehci-q.c
+++ b/drivers/usb/hcd/ehci-q.c
@@ -18,8 +18,6 @@
 
 /* this file is part of ehci-hcd.c */
 
-#include <asm/byteorder.h>
-
 /*-------------------------------------------------------------------------*/
 
 /*

diff --git a/drivers/usb/hcd/ehci-sched.c b/drivers/usb/hcd/ehci-sched.c
index 50303202976713c2461555cc98a21972acf60a30..0e40057ebf0748c3a0ca0ab861a03a72ae9a98d1 100644 (file)
--- a/drivers/usb/hcd/ehci-sched.c
+++ b/drivers/usb/hcd/ehci-sched.c
@@ -20,8 +20,6 @@
 
 /*-------------------------------------------------------------------------*/
 
-#include "ehci.h"
-
 /*
  * EHCI scheduled transaction support:  interrupt, iso, split iso
  * These are called "periodic" transactions in the EHCI spec.
@@ -395,6 +393,9 @@ static int intr_submit (
                                frame += period;
                        } while (frame < ehci->periodic_size);
 
+                       /* update bandwidth utilization records (for usbfs) */
+                       usb_claim_bandwidth (urb->dev, urb, usecs, 0);
+
                        /* maybe enable periodic schedule processing */
                        if (!ehci->periodic_urbs++) {
                                u32     cmd;

diff --git a/drivers/usb/hcd/ohci-q.c b/drivers/usb/hcd/ohci-q.c
index ba17a661c3f9ea5275effc48e8fa1224fd9c3862..dd0a2aee037794e9177f21d19cef25ee9ef053b0 100644 (file)
--- a/drivers/usb/hcd/ohci-q.c
+++ b/drivers/usb/hcd/ohci-q.c
@@ -8,8 +8,6 @@
  * $Id: ohci-q.c,v 1.6 2002/01/19 00:23:15 dbrownell Exp $
  */
 
-#include <asm/byteorder.h>
- 
 static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv)
 {
        int             last = urb_priv->length - 1;