svn commit: r360018 - in head/sys/arm: mv nvidia

[Emmanuel Vadot]

Author: manu
Date: Thu Apr 16 18:37:11 2020
New Revision: 360018
URL: https://svnweb.freebsd.org/changeset/base/360018

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

Modified:
  head/sys/arm/mv/mv_pci.c
  head/sys/arm/nvidia/tegra_pcie.c

Modified: head/sys/arm/mv/mv_pci.c
==============================================================================
--- head/sys/arm/mv/mv_pci.c	Thu Apr 16 17:53:23 2020	(r360017)
+++ head/sys/arm/mv/mv_pci.c	Thu Apr 16 18:37:11 2020	(r360018)
@@ -409,8 +409,8 @@ static driver_t mv_pcib_driver = {
 
 devclass_t pcib_devclass;
 
-DRIVER_MODULE(pcib, ofwbus, mv_pcib_driver, pcib_devclass, 0, 0);
-DRIVER_MODULE(pcib, pcib_ctrl, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(mv_pcib, ofwbus, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(mv_pcib, pcib_ctrl, mv_pcib_driver, pcib_devclass, 0, 0);
 
 static struct mtx pcicfg_mtx;
 

Modified: head/sys/arm/nvidia/tegra_pcie.c
==============================================================================
--- head/sys/arm/nvidia/tegra_pcie.c	Thu Apr 16 17:53:23 2020	(r360017)
+++ head/sys/arm/nvidia/tegra_pcie.c	Thu Apr 16 18:37:11 2020	(r360018)
@@ -1630,7 +1630,7 @@ static device_method_t tegra_pcib_methods[] = {
 };
 
 static devclass_t pcib_devclass;
-DEFINE_CLASS_1(pcib, tegra_pcib_driver, tegra_pcib_methods,
+DEFINE_CLASS_1(tegra_pcib, tegra_pcib_driver, tegra_pcib_methods,
     sizeof(struct tegra_pcib_softc), ofw_pci_driver);
-DRIVER_MODULE(pcib, simplebus, tegra_pcib_driver, pcib_devclass,
+DRIVER_MODULE(tegra_pcib, simplebus, tegra_pcib_driver, pcib_devclass,
     NULL, NULL);