Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 16 Apr 2020 16:59:37 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r360013 - head/sys/dev/usb/controller
Message-ID:  <202004161659.03GGxbf0069868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Thu Apr 16 16:59:37 2020
New Revision: 360013
URL: https://svnweb.freebsd.org/changeset/base/360013

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
  
  A similar fix was done in r333074 but imx_ehci wasn't renamed and generic_ehci wasn't
  present at that time.

Modified:
  head/sys/dev/usb/controller/ehci_imx.c
  head/sys/dev/usb/controller/generic_ehci_fdt.c

Modified: head/sys/dev/usb/controller/ehci_imx.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_imx.c	Thu Apr 16 16:50:33 2020	(r360012)
+++ head/sys/dev/usb/controller/ehci_imx.c	Thu Apr 16 16:59:37 2020	(r360013)
@@ -510,5 +510,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(imx_ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(imx_ehci, usb, 1, 1, 1);

Modified: head/sys/dev/usb/controller/generic_ehci_fdt.c
==============================================================================
--- head/sys/dev/usb/controller/generic_ehci_fdt.c	Thu Apr 16 16:50:33 2020	(r360012)
+++ head/sys/dev/usb/controller/generic_ehci_fdt.c	Thu Apr 16 16:59:37 2020	(r360013)
@@ -252,5 +252,5 @@ DEFINE_CLASS_1(ehci, ehci_fdt_driver, ehci_fdt_methods
 
 static devclass_t ehci_fdt_devclass;
 
-DRIVER_MODULE(ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0, 0);
-MODULE_DEPEND(ehci, usb, 1, 1, 1);
+DRIVER_MODULE(generic_ehci, simplebus, ehci_fdt_driver, ehci_fdt_devclass, 0, 0);
+MODULE_DEPEND(generic_ehci, usb, 1, 1, 1);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004161659.03GGxbf0069868>