greybus: pwm: Create separate module

Create separate module for pwm 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>

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index b9e4e9663e3318609192b0a2729512f575c9c6fe..2bd23b782d13c0ea319d8567eea4ba8746df90a2 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -17,7 +17,6 @@ greybus-y :=  core.o          \
 gb-phy-y :=    gpbridge.o      \
                sdio.o  \
                uart.o  \
-               pwm.o   \
                spi.o   \
                usb.o
 
@@ -38,6 +37,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-pwm-y := pwm.o
 gb-gpio-y := gpio.o
 gb-i2c-y := i2c.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-pwm.o
 obj-m += gb-gpio.o
 obj-m += gb-i2c.o
 

diff --git a/drivers/staging/greybus/gpbridge.c b/drivers/staging/greybus/gpbridge.c
index 92838d5569c838f1db5007cc7617ca81c9bb4764..ecff3b1f1861d27bf46a0cd28cf0adb490db5894 100644 (file)
--- a/drivers/staging/greybus/gpbridge.c
+++ b/drivers/staging/greybus/gpbridge.c
@@ -317,10 +317,6 @@ static int __init gpbridge_init(void)
                goto error_gpbridge;
        }
 
-       if (gb_pwm_driver_init()) {
-               pr_err("error initializing pwm driver\n");
-               goto error_pwm;
-       }
        if (gb_uart_driver_init()) {
                pr_err("error initializing uart driver\n");
                goto error_uart;
@@ -347,8 +343,6 @@ error_usb:
 error_sdio:
        gb_uart_driver_exit();
 error_uart:
-       gb_pwm_driver_exit();
-error_pwm:
        greybus_deregister(&gb_gpbridge_driver);
 error_gpbridge:
        bus_unregister(&gpbridge_bus_type);
@@ -363,7 +357,6 @@ static void __exit gpbridge_exit(void)
        gb_usb_driver_exit();
        gb_sdio_driver_exit();
        gb_uart_driver_exit();
-       gb_pwm_driver_exit();
 
        greybus_deregister(&gb_gpbridge_driver);
        bus_unregister(&gpbridge_bus_type);

diff --git a/drivers/staging/greybus/gpbridge.h b/drivers/staging/greybus/gpbridge.h
index 3f0340e7347db886681ff87bf7fe826fe4f11462..fe254bd36a5c14bad4977efbd95ad678bdd40778 100644 (file)
--- a/drivers/staging/greybus/gpbridge.h
+++ b/drivers/staging/greybus/gpbridge.h
@@ -66,9 +66,6 @@ void gb_##__driver##_exit(void)                               \
        gb_gpbridge_deregister(&__driver);                      \
 }
 
-extern int gb_pwm_driver_init(void);
-extern void gb_pwm_driver_exit(void);
-
 extern int gb_uart_driver_init(void);
 extern void gb_uart_driver_exit(void);
 

diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index b11e77df4a6cf134ce5324a0f15e9a94e519d002..1c4ffb9a0ae1883410d30d96b5f22deb5920b514 100644 (file)
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -256,6 +256,7 @@ static const struct gpbridge_device_id gb_pwm_id_table[] = {
        { GPBRIDGE_PROTOCOL(GREYBUS_PROTOCOL_PWM) },
        { },
 };
+MODULE_DEVICE_TABLE(gpbridge, gb_pwm_id_table);
 
 static struct gpbridge_driver pwm_driver = {
        .name           = "pwm",
@@ -263,4 +264,6 @@ static struct gpbridge_driver pwm_driver = {
        .remove         = gb_pwm_remove,
        .id_table       = gb_pwm_id_table,
 };
-gb_gpbridge_builtin_driver(pwm_driver);
+
+module_gpbridge_driver(pwm_driver);
+MODULE_LICENSE("GPL v2");