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>

8 files changed, 8 insertions, 72 deletions

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 6a4a0f2a835d..871f2d0558b0 100644
--- 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 00dc7e57f4a4..2f6e68c1be88 100644
--- 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 6fdbf1167ecb..14fdea184c39 100644
--- 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 7495716070c7..7f675bfed1d7 100644
--- 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 d324846d09ab..9a0348c62478 100644
--- 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 a8fb04ad15b5..430c3ad70a5a 100644
--- 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 35ab3cad5714..47de9698f50c 100644
--- 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 ea9784171352..609b7cc66768 100644
--- 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);