Revert "USB: EHCI: make ehci-platform a separate driver"

This reverts commit 99f91934a907df31ba878dfdd090002049dc476a.

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index d6bb128ce21ee424a02dfb7db31c96bc88c9af44..10130f47fc78c22da77096b13816e9ec16d24ca8 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -430,7 +430,7 @@ config USB_OHCI_HCD_PLATFORM
          If unsure, say N.
 
 config USB_EHCI_HCD_PLATFORM
-       tristate "Generic EHCI driver for a platform device"
+       bool "Generic EHCI driver for a platform device"
        depends on USB_EHCI_HCD
        default n
        ---help---

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 1eb4c3006e9eab8b7d2588c0322d38b9ad724327..a8390b091c4d5ef4abae21b29f50b0e87af4a21a 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_PCI)             += pci-quirks.o
 
 obj-$(CONFIG_USB_EHCI_HCD)     += ehci-hcd.o
 obj-$(CONFIG_USB_EHCI_PCI)     += ehci-pci.o
-obj-$(CONFIG_USB_EHCI_HCD_PLATFORM)    += ehci-platform.o
 
 obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
 obj-$(CONFIG_USB_ISP116X_HCD)  += isp116x-hcd.o

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4a466d7730c5025f18c20ad12ff5e0c25670a882..7113d6ad24f7904a0e7001109752d7099b2224e1 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1357,8 +1357,12 @@ MODULE_LICENSE ("GPL");
 #define        PLATFORM_DRIVER         ehci_hcd_sead3_driver
 #endif
 
+#ifdef CONFIG_USB_EHCI_HCD_PLATFORM
+#include "ehci-platform.c"
+#define PLATFORM_DRIVER                ehci_platform_driver
+#endif
+
 #if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \
-       !IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \
        !defined(PLATFORM_DRIVER) && \
        !defined(PS3_SYSTEM_BUS_DRIVER) && \
        !defined(OF_PLATFORM_DRIVER) && \

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index f97fe3a4d81cf4e7e76d0983854e20b5eff2f86f..6e6c23bdb4842ea6fa92ce4751375a64e1c55dab 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -18,19 +18,9 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/usb.h>
-#include <linux/usb/hcd.h>
 #include <linux/usb/ehci_pdriver.h>
 
-#include "ehci.h"
-
-#define DRIVER_DESC "EHCI generic platform driver"
-
-static const char hcd_name[] = "ehci-platform";
-
 static int ehci_platform_reset(struct usb_hcd *hcd)
 {
        struct platform_device *pdev = to_platform_device(hcd->self.controller);
@@ -53,11 +43,36 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
        return 0;
 }
 
-static struct hc_driver __read_mostly ehci_platform_hc_driver;
+static const struct hc_driver ehci_platform_hc_driver = {
+       .description            = hcd_name,
+       .product_desc           = "Generic Platform EHCI Controller",
+       .hcd_priv_size          = sizeof(struct ehci_hcd),
+
+       .irq                    = ehci_irq,
+       .flags                  = HCD_MEMORY | HCD_USB2,
+
+       .reset                  = ehci_platform_reset,
+       .start                  = ehci_run,
+       .stop                   = ehci_stop,
+       .shutdown               = ehci_shutdown,
 
-static const struct ehci_driver_overrides platform_overrides = {
-       .product_desc = "Generic Platform EHCI controller",
-       .reset =        ehci_platform_reset,
+       .urb_enqueue            = ehci_urb_enqueue,
+       .urb_dequeue            = ehci_urb_dequeue,
+       .endpoint_disable       = ehci_endpoint_disable,
+       .endpoint_reset         = ehci_endpoint_reset,
+
+       .get_frame_number       = ehci_get_frame,
+
+       .hub_status_data        = ehci_hub_status_data,
+       .hub_control            = ehci_hub_control,
+#if defined(CONFIG_PM)
+       .bus_suspend            = ehci_bus_suspend,
+       .bus_resume             = ehci_bus_resume,
+#endif
+       .relinquish_port        = ehci_relinquish_port,
+       .port_handed_over       = ehci_port_handed_over,
+
+       .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 };
 
 static int __devinit ehci_platform_probe(struct platform_device *dev)
@@ -203,26 +218,3 @@ static struct platform_driver ehci_platform_driver = {
                .pm     = &ehci_platform_pm_ops,
        }
 };
-
-static int __init ehci_platform_init(void)
-{
-       if (usb_disabled())
-               return -ENODEV;
-
-       pr_info("%s: " DRIVER_DESC "\n", hcd_name);
-
-       ehci_init_driver(&ehci_platform_hc_driver, &platform_overrides);
-       return platform_driver_register(&ehci_platform_driver);
-}
-module_init(ehci_platform_init);
-
-static void __exit ehci_platform_cleanup(void)
-{
-       platform_driver_unregister(&ehci_platform_driver);
-}
-module_exit(ehci_platform_cleanup);
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_AUTHOR("Hauke Mehrtens");
-MODULE_AUTHOR("Alan Stern");
-MODULE_LICENSE("GPL");