greybus: gbphy: Remove protocol specific version handling

We should be using the generic version handling at bundle level, instead
of at protocol level for bridged PHY devices as well.

The bundle version handling is already in place, though it is *not* used
today as we haven't bumped the version of control protocol yet.

Remove protocol specific handling for bridged PHY devices.

Tested on EVT 1.5 with gpbridge-test module. No nuttx changes are
required with this.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 9cd0bac9ceb91de570fa76140c6b9fd748324a4d..7d0988ef1183bbc963f41452ff83a75d5b7cdc28 100644 (file)
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -44,9 +44,6 @@ struct gb_connection {
        gb_request_handler_t            handler;
        unsigned long                   flags;
 
-       u8                              module_major;
-       u8                              module_minor;
-
        struct mutex                    mutex;
        spinlock_t                      lock;
        enum gb_connection_state        state;

diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
index c11a1368d07329186d09f6baba7896b3cfcdc91a..2727e4afcf4c21c186c8d36114a134de8454b368 100644 (file)
--- a/drivers/staging/greybus/gbphy.c
+++ b/drivers/staging/greybus/gbphy.c
@@ -171,33 +171,6 @@ void gb_gbphy_deregister_driver(struct gbphy_driver *driver)
 }
 EXPORT_SYMBOL_GPL(gb_gbphy_deregister_driver);
 
-int gb_gbphy_get_version(struct gb_connection *connection)
-{
-       struct gb_protocol_version_request request;
-       struct gb_protocol_version_response response;
-       int retval;
-
-       request.major = 1;
-       request.minor = 0;
-
-       retval = gb_operation_sync(connection, GB_REQUEST_TYPE_PROTOCOL_VERSION,
-                                  &request, sizeof(request), &response,
-                                  sizeof(response));
-       if (retval)
-               return retval;
-
-       /* FIXME - do proper version negotiation here someday... */
-
-       connection->module_major = response.major;
-       connection->module_minor = response.minor;
-
-       dev_dbg(&connection->hd->dev, "%s: v%u.%u\n", connection->name,
-               response.major, response.minor);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(gb_gbphy_get_version);
-
 static struct gbphy_device *gb_gbphy_create_dev(struct gb_bundle *bundle,
                                struct greybus_descriptor_cport *cport_desc)
 {

diff --git a/drivers/staging/greybus/gbphy.h b/drivers/staging/greybus/gbphy.h
index 79dbf7e1be588f7e65ac6700320d1e626611f71c..68ad51821a60fac494d90a306db7d30bd4784391 100644 (file)
--- a/drivers/staging/greybus/gbphy.h
+++ b/drivers/staging/greybus/gbphy.h
@@ -46,7 +46,6 @@ struct gbphy_driver {
 };
 #define to_gbphy_driver(d) container_of(d, struct gbphy_driver, driver)
 
-int gb_gbphy_get_version(struct gb_connection *connection);
 int gb_gbphy_register_driver(struct gbphy_driver *driver,
                             struct module *owner, const char *mod_name);
 void gb_gbphy_deregister_driver(struct gbphy_driver *driver);

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index e1ad6802630a5828f193d507c22ff661e3c58d03..f60cc1da9f055b26c4e8f4fe4f8751a0e82efa24 100644 (file)
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -654,10 +654,6 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,
        if (ret)
                goto exit_connection_destroy;
 
-       ret = gb_gbphy_get_version(connection);
-       if (ret)
-               goto exit_connection_disable;
-
        ret = gb_gpio_controller_setup(ggc);
        if (ret)
                goto exit_connection_disable;

diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index 6550f1744ed828d0f0cb8194a167e8c6bfb3174e..82075c703f333762c98b7f7415e3f0aefe6391c4 100644 (file)
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -97,7 +97,6 @@ struct gb_operation_msg_hdr {
 
 /* Generic request types */
 #define GB_REQUEST_TYPE_PING                   0x00
-#define GB_REQUEST_TYPE_PROTOCOL_VERSION       0x01
 #define GB_REQUEST_TYPE_INVALID                        0x7f
 
 struct gb_protocol_version_request {
@@ -614,10 +613,6 @@ struct gb_hid_input_report_request {
 
 /* I2C */
 
-/* Version of the Greybus i2c protocol we support */
-#define GB_I2C_VERSION_MAJOR           0x00
-#define GB_I2C_VERSION_MINOR           0x01
-
 /* Greybus i2c request types */
 #define GB_I2C_TYPE_FUNCTIONALITY      0x02
 #define GB_I2C_TYPE_TRANSFER           0x05
@@ -654,10 +649,6 @@ struct gb_i2c_transfer_response {
 
 /* GPIO */
 
-/* Version of the Greybus GPIO protocol we support */
-#define GB_GPIO_VERSION_MAJOR          0x00
-#define GB_GPIO_VERSION_MINOR          0x01
-
 /* Greybus GPIO request types */
 #define GB_GPIO_TYPE_LINE_COUNT                0x02
 #define GB_GPIO_TYPE_ACTIVATE          0x03
@@ -757,10 +748,6 @@ struct gb_gpio_irq_event_request {
 
 /* PWM */
 
-/* Version of the Greybus PWM protocol we support */
-#define GB_PWM_VERSION_MAJOR           0x00
-#define GB_PWM_VERSION_MINOR           0x01
-
 /* Greybus PWM operation types */
 #define GB_PWM_TYPE_PWM_COUNT          0x02
 #define GB_PWM_TYPE_ACTIVATE           0x03
@@ -804,10 +791,6 @@ struct gb_pwm_disable_request {
 
 /* SPI */
 
-/* Version of the Greybus spi protocol we support */
-#define GB_SPI_VERSION_MAJOR           0x00
-#define GB_SPI_VERSION_MINOR           0x01
-
 /* Should match up with modes in linux/spi/spi.h */
 #define GB_SPI_MODE_CPHA               0x01            /* clock phase */
 #define GB_SPI_MODE_CPOL               0x02            /* clock polarity */
@@ -1246,10 +1229,6 @@ struct gb_raw_send_request {
 
 /* UART */
 
-/* Version of the Greybus UART protocol we support */
-#define GB_UART_VERSION_MAJOR          0x00
-#define GB_UART_VERSION_MINOR          0x01
-
 /* Greybus UART operation types */
 #define GB_UART_TYPE_SEND_DATA                 0x02
 #define GB_UART_TYPE_RECEIVE_DATA              0x03    /* Unsolicited data */
@@ -1356,10 +1335,6 @@ struct gb_loopback_transfer_response {
 } __packed;
 
 /* SDIO */
-/* Version of the Greybus sdio protocol we support */
-#define GB_SDIO_VERSION_MAJOR          0x00
-#define GB_SDIO_VERSION_MINOR          0x01
-
 /* Greybus SDIO operation types */
 #define GB_SDIO_TYPE_GET_CAPABILITIES          0x02
 #define GB_SDIO_TYPE_SET_IOS                   0x03

diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index 6c14e6776adf46841dd390f23af151dee6f7f5e7..2541bdbb9dd99a601a8de0099014d9f73c5f95aa 100644 (file)
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -271,10 +271,6 @@ static int gb_i2c_probe(struct gbphy_device *gbphy_dev,
        if (ret)
                goto exit_connection_destroy;
 
-       ret = gb_gbphy_get_version(connection);
-       if (ret)
-               goto exit_connection_disable;
-
        ret = gb_i2c_device_setup(gb_i2c_dev);
        if (ret)
                goto exit_connection_disable;

diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index 77b05e895550d9733b2407a0de95470b2a61282b..b941cb5b5063ff8f36fbf6507a51ca902693defd 100644 (file)
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -206,10 +206,6 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
        if (ret)
                goto exit_connection_destroy;
 
-       ret = gb_gbphy_get_version(connection);
-       if (ret)
-               goto exit_connection_disable;
-
        /* Query number of pwms present */
        ret = gb_pwm_count_operation(pwmc);
        if (ret)

diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index bdcc86923c541902b5c43094e7721e76a7d240a9..a270517c90c87d9fd54c0f2c2f10aefde2b8a41b 100644 (file)
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -748,10 +748,6 @@ static int gb_sdio_probe(struct gbphy_device *gbphy_dev,
        if (ret)
                goto exit_connection_destroy;
 
-       ret = gb_gbphy_get_version(connection);
-       if (ret)
-               goto exit_connection_disable;
-
        ret = gb_sdio_get_caps(host);
        if (ret < 0)
                goto exit_connection_disable;

diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index 4f13efeeb91e5ea61085360a7c1c6dfed5da153a..a82337931c0d25af19fa4da98ae2a17da8510093 100644 (file)
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -29,10 +29,6 @@ static int gb_spi_probe(struct gbphy_device *gbphy_dev,
        if (ret)
                goto exit_connection_destroy;
 
-       ret = gb_gbphy_get_version(connection);
-       if (ret)
-               goto exit_connection_disable;
-
        ret = gb_spilib_master_init(connection, &gbphy_dev->dev);
        if (ret)
                goto exit_connection_disable;

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index a2fca3b3358e9295c60f117c6fa62af0003b6b6b..d1611abf8ccd92c449ebe572c3f1c3e7d7fc9b45 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -904,10 +904,6 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev,
        if (retval)
                goto exit_release_minor;
 
-       retval = gb_gbphy_get_version(connection);
-       if (retval)
-               goto exit_connection_disable;
-
        send_control(gb_tty, gb_tty->ctrlout);
 
        /* initialize the uart to be 9600n81 */

diff --git a/drivers/staging/greybus/usb.c b/drivers/staging/greybus/usb.c
index e5ba34ac76430feb833de9cce75f80bf87e6cff3..ccadda084b766e864104c33efd88cf1b62ae831e 100644 (file)
--- a/drivers/staging/greybus/usb.c
+++ b/drivers/staging/greybus/usb.c
@@ -190,10 +190,6 @@ static int gb_usb_probe(struct gbphy_device *gbphy_dev,
        if (retval)
                goto exit_connection_destroy;
 
-       retval = gb_gbphy_get_version(connection);
-       if (retval)
-               goto exit_connection_disable;
-
        /*
         * FIXME: The USB bridged-PHY protocol driver depends on changes to
         *        USB core which are not yet upstream.