mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

greybus: gpio: Create separate module

Browse source 
Create separate module for gpio gpbridge driver.

Tested on EVT 1.5 by inserting GP test module, all the devices were
enumerated correctly.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2016-05-09 18:15:06 +05:30 committed by Greg Kroah-Hartman
parent 9b919bdfcc
commit 7c0925eb57
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/greybus/Makefile
View file

@ -18,7 +18,6 @@ gb-phy-y := gpbridge.o \
sdio.o \
uart.o \
pwm.o \
gpio.o \
i2c.o \
spi.o \
usb.o
@ -40,6 +39,7 @@ gb-audio-manager-y += audio_manager.o
gb-audio-manager-y += audio_manager_module.o
gb-camera-y := camera.o
gb-firmware-y := fw-core.o fw-download.o
gb-gpio-y := gpio.o
obj-m += greybus.o
obj-m += gb-phy.o
@ -62,6 +62,7 @@ obj-m += gb-audio-gb.o
obj-m += gb-audio-apbridgea.o
obj-m += gb-audio-manager.o
obj-m += gb-firmware.o
obj-m += gb-gpio.o
KERNELVER ?= $(shell uname -r)
KERNELDIR ?= /lib/modules/$(KERNELVER)/build

7
drivers/staging/greybus/gpbridge.c
View file

@ -317,10 +317,6 @@ static int __init gpbridge_init(void)
goto error_gpbridge;
}
if (gb_gpio_driver_init()) {
pr_err("error initializing gpio driver\n");
goto error_gpio;
}
if (gb_pwm_driver_init()) {
pr_err("error initializing pwm driver\n");
goto error_pwm;
@ -359,8 +355,6 @@ static int __init gpbridge_init(void)
error_uart:
gb_pwm_driver_exit();
error_pwm:
gb_gpio_driver_exit();
error_gpio:
greybus_deregister(&gb_gpbridge_driver);
error_gpbridge:
bus_unregister(&gpbridge_bus_type);
@ -377,7 +371,6 @@ static void __exit gpbridge_exit(void)
gb_sdio_driver_exit();
gb_uart_driver_exit();
gb_pwm_driver_exit();
gb_gpio_driver_exit();
greybus_deregister(&gb_gpbridge_driver);
bus_unregister(&gpbridge_bus_type);

3
drivers/staging/greybus/gpbridge.h
View file

@ -66,9 +66,6 @@ void gb_##__driver##_exit(void) \
gb_gpbridge_deregister(&__driver); \
}
extern int gb_gpio_driver_init(void);
extern void gb_gpio_driver_exit(void);
extern int gb_pwm_driver_init(void);
extern void gb_pwm_driver_exit(void);

5
drivers/staging/greybus/gpio.c
View file

@ -747,6 +747,7 @@ static const struct gpbridge_device_id gb_gpio_id_table[] = {
{ GPBRIDGE_PROTOCOL(GREYBUS_PROTOCOL_GPIO) },
{ },
};
MODULE_DEVICE_TABLE(gpbridge, gb_gpio_id_table);
static struct gpbridge_driver gpio_driver = {
.name = "gpio",
@ -754,4 +755,6 @@ static struct gpbridge_driver gpio_driver = {
.remove = gb_gpio_remove,
.id_table = gb_gpio_id_table,
};
gb_gpbridge_builtin_driver(gpio_driver);
module_gpbridge_driver(gpio_driver);
MODULE_LICENSE("GPL v2");