Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6.git] / drivers / usb / host / ohci-hcd.c
index b426c1e..e728863 100644 (file)
@@ -75,6 +75,7 @@ static const char     hcd_name [] = "ohci_hcd";
 #define        STATECHANGE_DELAY       msecs_to_jiffies(300)
 
 #include "ohci.h"
+#include "pci-quirks.h"
 
 static void ohci_dump (struct ohci_hcd *ohci, int verbose);
 static int ohci_init (struct ohci_hcd *ohci);
@@ -85,18 +86,8 @@ static int ohci_restart (struct ohci_hcd *ohci);
 #endif
 
 #ifdef CONFIG_PCI
-static void quirk_amd_pll(int state);
-static void amd_iso_dev_put(void);
 static void sb800_prefetch(struct ohci_hcd *ohci, int on);
 #else
-static inline void quirk_amd_pll(int state)
-{
-       return;
-}
-static inline void amd_iso_dev_put(void)
-{
-       return;
-}
 static inline void sb800_prefetch(struct ohci_hcd *ohci, int on)
 {
        return;
@@ -912,7 +903,7 @@ static void ohci_stop (struct usb_hcd *hcd)
        if (quirk_zfmicro(ohci))
                del_timer(&ohci->unlink_watchdog);
        if (quirk_amdiso(ohci))
-               amd_iso_dev_put();
+               usb_amd_dev_put();
 
        remove_debug_files (ohci);
        ohci_mem_cleanup (ohci);
@@ -1063,10 +1054,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ohci_hcd_da8xx_driver
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7786)
+#ifdef CONFIG_USB_OHCI_SH
 #include "ohci-sh.c"
 #define PLATFORM_DRIVER                ohci_hcd_sh_driver
 #endif
@@ -1175,7 +1163,7 @@ static int __init ohci_hcd_mod_init(void)
 #endif
 
 #ifdef OF_PLATFORM_DRIVER
-       retval = of_register_platform_driver(&OF_PLATFORM_DRIVER);
+       retval = platform_driver_register(&OF_PLATFORM_DRIVER);
        if (retval < 0)
                goto error_of_platform;
 #endif
@@ -1234,7 +1222,7 @@ static int __init ohci_hcd_mod_init(void)
  error_sa1111:
 #endif
 #ifdef OF_PLATFORM_DRIVER
-       of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
+       platform_driver_unregister(&OF_PLATFORM_DRIVER);
  error_of_platform:
 #endif
 #ifdef PLATFORM_DRIVER
@@ -1282,7 +1270,7 @@ static void __exit ohci_hcd_mod_exit(void)
        sa1111_driver_unregister(&SA1111_DRIVER);
 #endif
 #ifdef OF_PLATFORM_DRIVER
-       of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
+       platform_driver_unregister(&OF_PLATFORM_DRIVER);
 #endif
 #ifdef PLATFORM_DRIVER
        platform_driver_unregister(&PLATFORM_DRIVER);