USB: EHCI: fix build error in ehci-mxc

This patch (as1643b) fixes a build error in ehci-hcd when compiling for ARM with allmodconfig: drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default] drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition drivers/usb/host/ehci-mxc.c:280:31: warning: 'ehci_mxc_driver' defined but not used [-Wunused-variable] drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default] drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition The fix is to convert ehci-mxc over to the new "ehci-hcd is a library" scheme so that it can coexist peacefully with the ehci-platform driver. As part of the conversion the ehci_mxc_priv data structure, which was allocated dynamically, is now placed where it belongs: in the private area at the end of struct ehci_hcd.

Alan Stern committed 13 years ago

Commit dba63b21 parent 9debc174 files · +53 −76Browse files

Unified · Split

4 files

drivers/usb/host/Kconfig +1 −1
drivers/usb/host/Makefile +1 −0
drivers/usb/host/ehci-hcd.c +1 −5
drivers/usb/host/ehci-mxc.c +50 −70

drivers/usb/host/Kconfig+1−1

@@ -148,7 +148,7 @@ config USB_EHCI_FSL · 147 unmodified lines
148	Variation of ARC USB block used in some Freescale chips.	148	Variation of ARC USB block used in some Freescale chips.
149		149
150	config USB_EHCI_MXC	150	config USB_EHCI_MXC
151	bool "Support for Freescale i.MX on-chip EHCI USB controller"	151	tristate "Support for Freescale i.MX on-chip EHCI USB controller"
152	depends on USB_EHCI_HCD && ARCH_MXC	152	depends on USB_EHCI_HCD && ARCH_MXC
153	select USB_EHCI_ROOT_HUB_TT	153	select USB_EHCI_ROOT_HUB_TT
154	---help---	154	---help---

drivers/usb/host/Makefile+1−0

@@ -26,6 +26,7 @@ obj-$(CONFIG_PCI) += pci-quirks.o · 25 unmodified lines
26	obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o	26	obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
27	obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o	27	obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
28	obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o	28	obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o
		29	obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
29		30
30	obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o	31	obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
31	obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o	32	obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o

drivers/usb/host/ehci-hcd.c+1−5

 #define	PLATFORM_DRIVER		ehci_fsl_driver
 #endif
-#ifdef CONFIG_USB_EHCI_MXC
-#include "ehci-mxc.c"
-#define PLATFORM_DRIVER		ehci_mxc_driver
-#endif
 #ifdef CONFIG_USB_EHCI_SH
 #include "ehci-sh.c"
 #define PLATFORM_DRIVER		ehci_hcd_sh_driver
 #if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \
 	!IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \
 	!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \
+	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \
 	!defined(PLATFORM_DRIVER) && \
 	!defined(PS3_SYSTEM_BUS_DRIVER) && \
 	!defined(OF_PLATFORM_DRIVER) && \

drivers/usb/host/ehci-mxc.c+50−70

  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 #include <linux/slab.h>
+#include <linux/usb.h>
+#include <linux/usb/hcd.h>
 #include <linux/platform_data/usb-ehci-mxc.h>
 #include <asm/mach-types.h>
+#include "ehci.h"
+#define DRIVER_DESC "Freescale On-Chip EHCI Host driver"
+static const char hcd_name[] = "ehci-mxc";
 #define ULPI_VIEWPORT_OFFSET	0x170
 struct ehci_mxc_priv {
 	struct clk *usbclk, *ahbclk, *phyclk;
-	struct usb_hcd *hcd;
 };
-/* called during probe() after chip reset completes */
+static struct hc_driver __read_mostly ehci_mxc_hc_driver;
-static int ehci_mxc_setup(struct usb_hcd *hcd)
-{
-	hcd->has_tt = 1;
-	return ehci_setup(hcd);
-}
-static const struct hc_driver ehci_mxc_hc_driver = {
+static const struct ehci_driver_overrides ehci_mxc_overrides __initdata = {
-	.description = hcd_name,
+	.extra_priv_size =	sizeof(struct ehci_mxc_priv),
-	.product_desc = "Freescale On-Chip EHCI Host Controller",
-	.hcd_priv_size = sizeof(struct ehci_hcd),
-	/*
-	 * generic hardware linkage
-	 */
-	.irq = ehci_irq,
-	.flags = HCD_USB2 | HCD_MEMORY,
-	/*
-	 * basic lifecycle operations
-	 */
-	.reset = ehci_mxc_setup,
-	.start = ehci_run,
-	.stop = ehci_stop,
-	.shutdown = ehci_shutdown,
-	/*
-	 * managing i/o requests and associated device resources
-	 */
-	.urb_enqueue = ehci_urb_enqueue,
-	.urb_dequeue = ehci_urb_dequeue,
-	.endpoint_disable = ehci_endpoint_disable,
-	.endpoint_reset = ehci_endpoint_reset,
-	/*
-	 * scheduling support
-	 */
-	.get_frame_number = ehci_get_frame,
-	/*
-	 * root hub support
-	 */
-	.hub_status_data = ehci_hub_status_data,
-	.hub_control = ehci_hub_control,
-	.bus_suspend = ehci_bus_suspend,
-	.bus_resume = ehci_bus_resume,
-	.relinquish_port = ehci_relinquish_port,
-	.port_handed_over = ehci_port_handed_over,
-	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 };
 static int ehci_mxc_drv_probe(struct platform_device *pdev)
 	if (!hcd)
 		return -ENOMEM;
-	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-	if (!priv) {
-		ret = -ENOMEM;
-		goto err_alloc;
-	}
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(dev, "Found HC with no register addr. Check setup!\n");
 		goto err_alloc;
 	}
+	hcd->has_tt = 1;
+	ehci = hcd_to_ehci(hcd);
+	priv = (struct ehci_mxc_priv *) ehci->priv;
 	/* enable clocks */
 	priv->usbclk = devm_clk_get(&pdev->dev, "ipg");
 	if (IS_ERR(priv->usbclk)) {
 		mdelay(10);
 	}
-	ehci = hcd_to_ehci(hcd);
 	/* EHCI registers start at offset 0x100 */
 	ehci->caps = hcd->regs + 0x100;
 	ehci->regs = hcd->regs + 0x100 +
 		}
 	}
-	priv->hcd = hcd;
+	platform_set_drvdata(pdev, hcd);
-	platform_set_drvdata(pdev, priv);
 	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (ret)
 static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
 {
 	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
-	struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);
+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-	struct usb_hcd *hcd = priv->hcd;
+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+	struct ehci_mxc_priv *priv = (struct ehci_mxc_priv *) ehci->priv;
+	usb_remove_hcd(hcd);
 	if (pdata && pdata->exit)
 		pdata->exit(pdev);
 	if (pdata->otg)
 		usb_phy_shutdown(pdata->otg);
-	usb_remove_hcd(hcd);
-	usb_put_hcd(hcd);
-	platform_set_drvdata(pdev, NULL);
 	clk_disable_unprepare(priv->usbclk);
 	clk_disable_unprepare(priv->ahbclk);
 	if (priv->phyclk)
 		clk_disable_unprepare(priv->phyclk);
+	usb_put_hcd(hcd);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 static void ehci_mxc_drv_shutdown(struct platform_device *pdev)
 {
-	struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);
+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-	struct usb_hcd *hcd = priv->hcd;
 	if (hcd->driver->shutdown)
 		hcd->driver->shutdown(hcd);
 static struct platform_driver ehci_mxc_driver = {
 	.probe = ehci_mxc_drv_probe,
-	.remove = __exit_p(ehci_mxc_drv_remove),
+	.remove = ehci_mxc_drv_remove,
 	.shutdown = ehci_mxc_drv_shutdown,
 	.driver = {
 		   .name = "mxc-ehci",
 	},
 };
+static int __init ehci_mxc_init(void)
+{
+	if (usb_disabled())
+		return -ENODEV;
+	pr_info("%s: " DRIVER_DESC "\n", hcd_name);
+	ehci_init_driver(&ehci_mxc_hc_driver, &ehci_mxc_overrides);
+	return platform_driver_register(&ehci_mxc_driver);
+}
+module_init(ehci_mxc_init);
+static void __exit ehci_mxc_cleanup(void)
+{
+	platform_driver_unregister(&ehci_mxc_driver);
+}
+module_exit(ehci_mxc_cleanup);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Sascha Hauer");
+MODULE_LICENSE("GPL");