greybus: battery-gb: move the battery protocol out to a stand-alone module

This moves the battery class protocol to be a stand-alone kernel module.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index f7284680f6e0a3563c8beeb9f3280ea66d760efc..79cb193e453b22d50c443ca40a4ba3ef47d8a8f8 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -12,12 +12,12 @@ greybus-y :=        core.o          \
                pwm-gb.o        \
                sdio-gb.o       \
                uart-gb.o       \
-               battery-gb.o    \
                usb-gb.o
 
 obj-m += greybus.o
 obj-m += i2c-gb.o
 obj-m += vibrator-gb.o
+obj-m += battery-gb.o
 obj-m += es1-ap-usb.o
 
 KERNELVER              ?= $(shell uname -r)

diff --git a/drivers/staging/greybus/battery-gb.c b/drivers/staging/greybus/battery-gb.c
index f6b0dd68143049e37932f626cbb15cc387887969..7ce37377bca5a6a1331c25a4c31106639fdf9383 100644 (file)
--- a/drivers/staging/greybus/battery-gb.c
+++ b/drivers/staging/greybus/battery-gb.c
@@ -367,12 +367,6 @@ static struct gb_protocol battery_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-int gb_battery_protocol_init(void)
-{
-       return gb_protocol_register(&battery_protocol);
-}
+gb_protocol_driver(&battery_protocol);
 
-void gb_battery_protocol_exit(void)
-{
-       gb_protocol_deregister(&battery_protocol);
-}
+MODULE_LICENSE("GPL v2");

diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index 0d3c3367dab781dc025bfac481af6d0c26994536..e32f4ac8c7f2bfcca1e79c8aaa3ed76ffce32243 100644 (file)
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -183,10 +183,6 @@ bool gb_protocol_init(void)
 {
        bool ret = true;
 
-       if (gb_battery_protocol_init()) {
-               pr_err("error initializing battery protocol\n");
-               ret = false;
-       }
        if (gb_gpio_protocol_init()) {
                pr_err("error initializing gpio protocol\n");
                ret = false;
@@ -216,5 +212,4 @@ void gb_protocol_exit(void)
        gb_sdio_protocol_exit();
        gb_uart_protocol_exit();
        gb_gpio_protocol_exit();
-       gb_battery_protocol_exit();
 }

diff --git a/drivers/staging/greybus/protocol.h b/drivers/staging/greybus/protocol.h
index 7b1c09c941b1920562c38010d9db7f3dce73a447..1acc615944614afc751a34de7e393a9747aa59ee 100644 (file)
--- a/drivers/staging/greybus/protocol.h
+++ b/drivers/staging/greybus/protocol.h
@@ -51,9 +51,6 @@ void gb_protocol_put(struct gb_protocol *protocol);
  * Declared here for now.  They could be added via modules, or maybe
  * just use initcalls (which level?).
  */
-extern int gb_battery_protocol_init(void);
-extern void gb_battery_protocol_exit(void);
-
 extern int gb_gpio_protocol_init(void);
 extern void gb_gpio_protocol_exit(void);