linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index d63177a..9dd3d14 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -16,6 +16,7 @@
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dmapool.h>
@@ -625,11 +626,10 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd, struct pt_regs *regs)
                        writel (status | CMD_RUN, &ehci->regs->command);
 
                while (i--) {
-                       int pstatus = readl (&ehci->regs->port_status [i]);
-
-                       if (pstatus & PORT_OWNER)
+                       status = readl (&ehci->regs->port_status [i]);
+                       if (status & PORT_OWNER)
                                continue;
-                       if (!(pstatus & PORT_RESUME)
+                       if (!(status & PORT_RESUME)
                                        || ehci->reset_done [i] != 0)
                                continue;
 
@@ -889,59 +889,8 @@ MODULE_LICENSE ("GPL");
 
 #ifdef CONFIG_PCI
 #include "ehci-pci.c"
-#define        PCI_DRIVER              ehci_pci_driver
-#endif
-
-#ifdef CONFIG_MPC834x
-#include "ehci-fsl.c"
-#define        PLATFORM_DRIVER         ehci_fsl_driver
 #endif
 
-#ifdef CONFIG_SOC_AU1200
-#include "ehci-au1xxx.c"
-#define        PLATFORM_DRIVER         ehci_hcd_au1xxx_driver
-#endif
-
-#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
+#if !defined(CONFIG_PCI)
 #error "missing bus glue for ehci-hcd"
 #endif
-
-static int __init ehci_hcd_init(void)
-{
-       int retval = 0;
-
-       pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
-                hcd_name,
-                sizeof(struct ehci_qh), sizeof(struct ehci_qtd),
-                sizeof(struct ehci_itd), sizeof(struct ehci_sitd));
-
-#ifdef PLATFORM_DRIVER
-       retval = platform_driver_register(&PLATFORM_DRIVER);
-       if (retval < 0)
-               return retval;
-#endif
-
-#ifdef PCI_DRIVER
-       retval = pci_register_driver(&PCI_DRIVER);
-       if (retval < 0) {
-#ifdef PLATFORM_DRIVER
-               platform_driver_unregister(&PLATFORM_DRIVER);
-#endif
-       }
-#endif
-
-       return retval;
-}
-module_init(ehci_hcd_init);
-
-static void __exit ehci_hcd_cleanup(void)
-{
-#ifdef PLATFORM_DRIVER
-       platform_driver_unregister(&PLATFORM_DRIVER);
-#endif
-#ifdef PCI_DRIVER
-       pci_unregister_driver(&PCI_DRIVER);
-#endif
-}
-module_exit(ehci_hcd_cleanup);
-