greybus: Rename gb_gpbridge_protocol_driver() as gb_builtin_protocol_driver()

This macro is also required by core protocols like control and svc, and
hence the 'gpbridge' name doesn't fit anymore.

Lets call this macro gb_builtin_protocol_driver().

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 95909149eba24007906466e8b9e1898ceb1fb1f1..6539530a178c86dba4aa2f687bad26bcbb2ac220 100644 (file)
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -725,4 +725,4 @@ static struct gb_protocol gpio_protocol = {
        .request_recv           = gb_gpio_request_recv,
 };
 
-gb_gpbridge_protocol_driver(gpio_protocol);
+gb_builtin_protocol_driver(gpio_protocol);

diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 2f6e68c1be8829ac4c0ed3729dc74e3ebd8c246b..1214b7a0a631013c4a3d913aff034a6745fde20f 100644 (file)
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -529,4 +529,4 @@ static struct gb_protocol hid_protocol = {
        .request_recv           = gb_hid_irq_handler,
 };
 
-gb_gpbridge_protocol_driver(hid_protocol);
+gb_builtin_protocol_driver(hid_protocol);

diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index 01afca8408a0bc5d976cd9b1c812bc978a713021..5eb7703599d6720203bc9328fa09ee42a46ed957 100644 (file)
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -356,4 +356,4 @@ static struct gb_protocol i2c_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-gb_gpbridge_protocol_driver(i2c_protocol);
+gb_builtin_protocol_driver(i2c_protocol);

diff --git a/drivers/staging/greybus/protocol.h b/drivers/staging/greybus/protocol.h
index f6739f3332cd0803882d928355ee634084193684..3f226e3bbe06698dbd24156e5118bad84a37f3a9 100644 (file)
--- a/drivers/staging/greybus/protocol.h
+++ b/drivers/staging/greybus/protocol.h
@@ -103,7 +103,7 @@ static void __exit protocol_exit(void)                      \
 module_exit(protocol_exit)
 
 /* __protocol: string matching name of struct gb_protocol */
-#define gb_gpbridge_protocol_driver(__protocol)                \
+#define gb_builtin_protocol_driver(__protocol)         \
 int __init gb_##__protocol##_init(void)                        \
 {                                                      \
        return gb_protocol_register(&__protocol);       \

diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index 5dfeb0e761c189444d9567403469ff6b82e02bf7..be7131a41a97e03cf02ae7c273566cabb5d64f11 100644 (file)
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -246,4 +246,4 @@ static struct gb_protocol pwm_protocol = {
        .request_recv           = NULL, /* no incoming requests */
 };
 
-gb_gpbridge_protocol_driver(pwm_protocol);
+gb_builtin_protocol_driver(pwm_protocol);

diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index 30ebd42da2879f3e9e02b405bb993a329da13c23..f028e14fc918c84294704750967d4d00184ee4b9 100644 (file)
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -720,4 +720,4 @@ static struct gb_protocol sdio_protocol = {
        .request_recv           = gb_sdio_event_recv,
 };
 
-gb_gpbridge_protocol_driver(sdio_protocol);
+gb_builtin_protocol_driver(sdio_protocol);

diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index 78a7f85a4bf65eebc245aea4813106583660c89b..374361889666cf25279509dd066260a3039d8886 100644 (file)
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -347,4 +347,4 @@ static struct gb_protocol spi_protocol = {
        .request_recv           = NULL,
 };
 
-gb_gpbridge_protocol_driver(spi_protocol);
+gb_builtin_protocol_driver(spi_protocol);

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 7abcd1c05bdaa2e8437f846a524832132c7dc80d..e2a456f8105c86f6842e59e0c9a4b90b0d4ee792 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -773,4 +773,4 @@ static struct gb_protocol uart_protocol = {
        .request_recv           = gb_uart_request_recv,
 };
 
-gb_gpbridge_protocol_driver(uart_protocol);
+gb_builtin_protocol_driver(uart_protocol);

diff --git a/drivers/staging/greybus/usb.c b/drivers/staging/greybus/usb.c
index 609b7cc66768ff81a6fa8dafafb812bd659ae02a..888f514921b624d8dccbdc7c8841a8e2d983487a 100644 (file)
--- a/drivers/staging/greybus/usb.c
+++ b/drivers/staging/greybus/usb.c
@@ -362,4 +362,4 @@ static struct gb_protocol usb_protocol = {
        .request_recv           = NULL, /* FIXME we have requests!!! */
 };
 
-gb_gpbridge_protocol_driver(usb_protocol);
+gb_builtin_protocol_driver(usb_protocol);