Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Apr 2018 21:05:19 +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: r333073 - in head/sys/arm: allwinner freescale/imx
Message-ID:  <201804272105.w3RL5JbD041874@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Fri Apr 27 21:05:18 2018
New Revision: 333073
URL: https://svnweb.freebsd.org/changeset/base/333073

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

Modified:
  head/sys/arm/allwinner/a10_ahci.c
  head/sys/arm/freescale/imx/imx6_ahci.c

Modified: head/sys/arm/allwinner/a10_ahci.c
==============================================================================
--- head/sys/arm/allwinner/a10_ahci.c	Fri Apr 27 20:20:57 2018	(r333072)
+++ head/sys/arm/allwinner/a10_ahci.c	Fri Apr 27 21:05:18 2018	(r333073)
@@ -392,4 +392,4 @@ static driver_t ahci_ata_driver = {
         sizeof(struct ahci_controller)
 };
 
-DRIVER_MODULE(ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(a10_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);

Modified: head/sys/arm/freescale/imx/imx6_ahci.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ahci.c	Fri Apr 27 20:20:57 2018	(r333072)
+++ head/sys/arm/freescale/imx/imx6_ahci.c	Fri Apr 27 21:05:18 2018	(r333073)
@@ -353,4 +353,4 @@ static driver_t ahci_ata_driver = {
 	sizeof(struct ahci_controller)
 };
 
-DRIVER_MODULE(ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(imx6_ahci, simplebus, ahci_ata_driver, ahci_devclass, 0, 0);

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