svn commit: r333074 - in head/sys/arm: allwinner cavium/cns11xx freescale/vybrid samsung/exynos ti/usb xilinx

[Emmanuel Vadot]

Author: manu
Date: Fri Apr 27 21:05:58 2018
New Revision: 333074
URL: https://svnweb.freebsd.org/changeset/base/333074

Log:
  arm: Fix duplicate ehci DRIVER_MODULE
  
  Name each ehci driver uniquely.
  This remove the warning printed at each arm boot :
  module_register: cannot register simplebus/ehci from kernel; already loaded from kernel

Modified:
  head/sys/arm/allwinner/a10_ehci.c
  head/sys/arm/cavium/cns11xx/ehci_ebus.c
  head/sys/arm/freescale/vybrid/vf_ehci.c
  head/sys/arm/samsung/exynos/exynos5_ehci.c
  head/sys/arm/ti/usb/omap_ehci.c
  head/sys/arm/xilinx/zy7_ehci.c

Modified: head/sys/arm/allwinner/a10_ehci.c
==============================================================================
--- head/sys/arm/allwinner/a10_ehci.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/allwinner/a10_ehci.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -365,5 +365,5 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(a10_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(a10_ehci, usb, 1, 1, 1);

Modified: head/sys/arm/cavium/cns11xx/ehci_ebus.c
==============================================================================
--- head/sys/arm/cavium/cns11xx/ehci_ebus.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/cavium/cns11xx/ehci_ebus.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -244,5 +244,5 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, econaarm, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(ebus_ehci, econaarm, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(ebus_ehci, usb, 1, 1, 1);

Modified: head/sys/arm/freescale/vybrid/vf_ehci.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_ehci.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/freescale/vybrid/vf_ehci.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -166,8 +166,8 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(vybrid_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(vybrid_ehci, usb, 1, 1, 1);
 
 static void
 vybrid_ehci_post_reset(struct ehci_softc *ehci_softc)

Modified: head/sys/arm/samsung/exynos/exynos5_ehci.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_ehci.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/samsung/exynos/exynos5_ehci.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -131,8 +131,8 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(exynos_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(exynos_ehci, usb, 1, 1, 1);
 
 /*
  * Public methods

Modified: head/sys/arm/ti/usb/omap_ehci.c
==============================================================================
--- head/sys/arm/ti/usb/omap_ehci.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/ti/usb/omap_ehci.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -469,4 +469,4 @@ static driver_t ehci_driver = {
 
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, omap_uhh, ehci_driver, ehci_devclass, 0, 0);
+DRIVER_MODULE(omap_ehci, omap_uhh, ehci_driver, ehci_devclass, 0, 0);

Modified: head/sys/arm/xilinx/zy7_ehci.c
==============================================================================
--- head/sys/arm/xilinx/zy7_ehci.c	Fri Apr 27 21:05:18 2018	(r333073)
+++ head/sys/arm/xilinx/zy7_ehci.c	Fri Apr 27 21:05:58 2018	(r333074)
@@ -370,5 +370,5 @@ static driver_t ehci_driver = {
 };
 static devclass_t ehci_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, NULL, NULL);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(zy7_ehci, simplebus, ehci_driver, ehci_devclass, NULL, NULL);
+MODULE_DEPEND(zy7_ehci, usb, 1, 1, 1);