From c67d5d66bf06d4231bfa625123da52f3e613f6d8 Mon Sep 17 00:00:00 2001 From: Luiz Otavio O Souza Date: Thu, 29 Jan 2015 18:08:50 +0000 Subject: [PATCH] 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). --- sys/arm/xilinx/zy7_gpio.c | 7 +------ sys/arm/xscale/ixp425/avila_gpio.c | 6 +----- sys/arm/xscale/ixp425/cambria_gpio.c | 6 +----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c index ac73c9f4ad3..0b888126f62 100644 --- a/sys/arm/xilinx/zy7_gpio.c +++ b/sys/arm/xilinx/zy7_gpio.c @@ -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); diff --git a/sys/arm/xscale/ixp425/avila_gpio.c b/sys/arm/xscale/ixp425/avila_gpio.c index 4a2d1e94ff4..6d92e087165 100644 --- a/sys/arm/xscale/ixp425/avila_gpio.c +++ b/sys/arm/xscale/ixp425/avila_gpio.c @@ -344,15 +344,11 @@ static device_method_t gpio_avila_methods[] = { }; 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); diff --git a/sys/arm/xscale/ixp425/cambria_gpio.c b/sys/arm/xscale/ixp425/cambria_gpio.c index 7a773db6563..16c3489c526 100644 --- a/sys/arm/xscale/ixp425/cambria_gpio.c +++ b/sys/arm/xscale/ixp425/cambria_gpio.c @@ -476,16 +476,12 @@ static device_method_t cambria_gpio_methods[] = { }; 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);