svn commit: r277882 - in head/sys/arm: xilinx xscale/ixp425

[Luiz Otavio O Souza]

Author: loos
Date: Thu Jan 29 18:08:50 2015
New Revision: 277882
URL: https://svnweb.freebsd.org/changeset/base/277882

Log:
  Rename the avila, cambria and zynq GPIO driver names to match the expected
  string.
  
  With this change it is not necessary redeclare the driver relations with
  gpiobus and gpioc.
  
  This also prevents redundant declarations when gpiobusvar.h is included
  (which is going to happen soon).

Modified:
  head/sys/arm/xilinx/zy7_gpio.c
  head/sys/arm/xscale/ixp425/avila_gpio.c
  head/sys/arm/xscale/ixp425/cambria_gpio.c

Modified: head/sys/arm/xilinx/zy7_gpio.c
==============================================================================
--- head/sys/arm/xilinx/zy7_gpio.c	Thu Jan 29 16:19:05 2015	(r277881)
+++ head/sys/arm/xilinx/zy7_gpio.c	Thu Jan 29 18:08:50 2015	(r277882)
@@ -373,16 +373,11 @@ static device_method_t zy7_gpio_methods[
 };
 
 static driver_t zy7_gpio_driver = {
-	"zy7_gpio",
+	"gpio",
 	zy7_gpio_methods,
 	sizeof(struct zy7_gpio_softc),
 };
 static devclass_t zy7_gpio_devclass;
 
-extern devclass_t gpiobus_devclass, gpioc_devclass;
-extern driver_t gpiobus_driver, gpioc_driver;
-
 DRIVER_MODULE(zy7_gpio, simplebus, zy7_gpio_driver, zy7_gpio_devclass, \
 	      NULL, NULL);
-DRIVER_MODULE(gpiobus, zy7_gpio, gpiobus_driver, gpiobus_devclass, 0, 0);
-DRIVER_MODULE(gpioc, zy7_gpio, gpioc_driver, gpioc_devclass, 0, 0);

Modified: head/sys/arm/xscale/ixp425/avila_gpio.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_gpio.c	Thu Jan 29 16:19:05 2015	(r277881)
+++ head/sys/arm/xscale/ixp425/avila_gpio.c	Thu Jan 29 18:08:50 2015	(r277882)
@@ -344,15 +344,11 @@ static device_method_t gpio_avila_method
 };
 
 static driver_t gpio_avila_driver = {
-	"gpio_avila",
+	"gpio",
 	gpio_avila_methods,
 	sizeof(struct avila_gpio_softc),
 };
 static devclass_t gpio_avila_devclass;
-extern devclass_t gpiobus_devclass, gpioc_devclass;
-extern driver_t gpiobus_driver, gpioc_driver;
 
 DRIVER_MODULE(gpio_avila, ixp, gpio_avila_driver, gpio_avila_devclass, 0, 0);
-DRIVER_MODULE(gpiobus, gpio_avila, gpiobus_driver, gpiobus_devclass, 0, 0);
-DRIVER_MODULE(gpioc, gpio_avila, gpioc_driver, gpioc_devclass, 0, 0);
 MODULE_VERSION(gpio_avila, 1);

Modified: head/sys/arm/xscale/ixp425/cambria_gpio.c
==============================================================================
--- head/sys/arm/xscale/ixp425/cambria_gpio.c	Thu Jan 29 16:19:05 2015	(r277881)
+++ head/sys/arm/xscale/ixp425/cambria_gpio.c	Thu Jan 29 18:08:50 2015	(r277882)
@@ -476,16 +476,12 @@ static device_method_t cambria_gpio_meth
 };
 
 static driver_t cambria_gpio_driver = {
-	"gpio_cambria",
+	"gpio",
 	cambria_gpio_methods,
 	sizeof(struct cambria_gpio_softc),
 };
 static devclass_t cambria_gpio_devclass;
-extern devclass_t gpiobus_devclass, gpioc_devclass;
-extern driver_t gpiobus_driver, gpioc_driver;
 
 DRIVER_MODULE(gpio_cambria, iicbus, cambria_gpio_driver, cambria_gpio_devclass, 0, 0);
-DRIVER_MODULE(gpiobus, gpio_cambria, gpiobus_driver, gpiobus_devclass, 0, 0);
-DRIVER_MODULE(gpioc, gpio_cambria, gpioc_driver, gpioc_devclass, 0, 0);
 MODULE_VERSION(gpio_cambria, 1);
 MODULE_DEPEND(gpio_cambria, iicbus, 1, 1, 1);