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

[John Baldwin]

On 4/16/20 11:37 AM, Emmanuel Vadot wrote:
> 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/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);

I think this line you want to revert.  The first argument to DEFINE_CLASS_*
is the class name (the string name in a manual driver_t) and that needs to
stay "pcib" here.

The change to DRIVER_MODULE() in this file is correct though.

-- 
John Baldwin