greybus: Use gb_gpbridge_protocol_init()

Start using gb_gpbridge_protocol_init() in gpbridge drivers.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 6a4a0f2a835dec3238b98a149e9fba3a9063003d..871f2d0558b0af00b1dbee454cfe74a0dfce6b47 100644 (file)
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -672,12 +672,4 @@ static struct gb_protocol gpio_protocol = {
        .request_recv           = gb_gpio_request_recv,
 };
 
-int gb_gpio_protocol_init(void)
-{
-       return gb_protocol_register(&gpio_protocol);
-}
-
-void gb_gpio_protocol_exit(void)
-{
-       gb_protocol_deregister(&gpio_protocol);
-}
+gb_gpbridge_protocol_driver(gpio_protocol);

diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 00dc7e57f4a465cfaced3d752520410b75f723b4..2f6e68c1be8829ac4c0ed3729dc74e3ebd8c246b 100644 (file)
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -529,12 +529,4 @@ static struct gb_protocol hid_protocol = {
        .request_recv           = gb_hid_irq_handler,
 };
 
-int gb_hid_protocol_init(void)
-{
-       return gb_protocol_register(&hid_protocol);
-}
-
-void gb_hid_protocol_exit(void)
-{
-       gb_protocol_deregister(&hid_protocol);
-}
+gb_gpbridge_protocol_driver(hid_protocol);

diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index 6fdbf1167ecbfe891f7ad57ed2fd8803fe01f23f..14fdea184c39bbfb39c557dfa418c1db3c55525c 100644 (file)
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -358,12 +358,4 @@ static struct gb_protocol i2c_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-int gb_i2c_protocol_init(void)
-{
-       return gb_protocol_register(&i2c_protocol);
-}
-
-void gb_i2c_protocol_exit(void)
-{
-       gb_protocol_deregister(&i2c_protocol);
-}
+gb_gpbridge_protocol_driver(i2c_protocol);

diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index 7495716070c7a1e87b43ab55d6b8122cf2c74bb4..7f675bfed1d7a5e0e02940fe34a9d0efe96c6911 100644 (file)
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -246,12 +246,4 @@ static struct gb_protocol pwm_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-int gb_pwm_protocol_init(void)
-{
-       return gb_protocol_register(&pwm_protocol);
-}
-
-void gb_pwm_protocol_exit(void)
-{
-       gb_protocol_deregister(&pwm_protocol);
-}
+gb_gpbridge_protocol_driver(pwm_protocol);

diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index d324846d09ab25ce647476301384c005a6711e17..9a0348c62478dc4e188a9e9ef54e510934390824 100644 (file)
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -88,12 +88,4 @@ static struct gb_protocol sdio_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-int gb_sdio_protocol_init(void)
-{
-       return gb_protocol_register(&sdio_protocol);
-}
-
-void gb_sdio_protocol_exit(void)
-{
-       gb_protocol_deregister(&sdio_protocol);
-}
+gb_gpbridge_protocol_driver(sdio_protocol);

diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index a8fb04ad15b55b6edee733a64d2573639924ce0f..430c3ad70a5a0e5744cd8bc6966884acb3549b8b 100644 (file)
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -348,12 +348,4 @@ static struct gb_protocol spi_protocol = {
        .request_recv           = NULL,
 };
 
-int gb_spi_protocol_init(void)
-{
-       return gb_protocol_register(&spi_protocol);
-}
-
-void gb_spi_protocol_exit(void)
-{
-       gb_protocol_deregister(&spi_protocol);
-}
+gb_gpbridge_protocol_driver(spi_protocol);

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 35ab3cad5714e3f8972cf53e88dcf4600e5ed4ad..47de9698f50c224e82a183b44a0471bcdb1a2397 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -745,12 +745,4 @@ static struct gb_protocol uart_protocol = {
        .request_recv           = NULL, /* FIXME we have 2 types of requests!!! */
 };
 
-int gb_uart_protocol_init(void)
-{
-       return gb_protocol_register(&uart_protocol);
-}
-
-void gb_uart_protocol_exit(void)
-{
-       gb_protocol_deregister(&uart_protocol);
-}
+gb_gpbridge_protocol_driver(uart_protocol);

diff --git a/drivers/staging/greybus/usb.c b/drivers/staging/greybus/usb.c
index ea97841713525573932d74b1ed549fa35795a5a3..609b7cc66768ff81a6fa8dafafb812bd659ae02a 100644 (file)
--- a/drivers/staging/greybus/usb.c
+++ b/drivers/staging/greybus/usb.c
@@ -362,12 +362,4 @@ static struct gb_protocol usb_protocol = {
        .request_recv           = NULL, /* FIXME we have requests!!! */
 };
 
-int gb_usb_protocol_init(void)
-{
-       return gb_protocol_register(&usb_protocol);
-}
-
-void gb_usb_protocol_exit(void)
-{
-       gb_protocol_deregister(&usb_protocol);
-}
+gb_gpbridge_protocol_driver(usb_protocol);