greybus: uart: Drop get_version support

This is done from a common place now, no need to replicate it.

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

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 7a51c7c792c9f389c2d54cb6c1a37cf7c25d2eb9..9e8bf6f4b8d7936123817011b1540be8b7bd94c3 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -55,8 +55,6 @@ struct gb_tty {
        struct async_icount oldcount;
        wait_queue_head_t wioctl;
        struct mutex mutex;
-       u8 version_major;
-       u8 version_minor;
        u8 ctrlin;      /* input control lines */
        u8 ctrlout;     /* output control lines */
        struct gb_tty_line_coding line_coding;
@@ -67,9 +65,6 @@ static DEFINE_IDR(tty_minors);
 static DEFINE_MUTEX(table_lock);
 static atomic_t reference_count = ATOMIC_INIT(0);
 
-/* Define get_version() routine */
-define_get_version(gb_tty, UART);
-
 static int gb_uart_receive_data(struct gb_tty *gb_tty,
                                struct gb_connection *connection,
                                struct gb_uart_recv_data_request *receive_data)
@@ -628,21 +623,16 @@ static int gb_uart_connection_init(struct gb_connection *connection)
        gb_tty->connection = connection;
        connection->private = gb_tty;
 
-       /* Check for compatible protocol version */
-       retval = get_version(gb_tty);
-       if (retval)
-               goto error_version;
-
        minor = alloc_minor(gb_tty);
        if (minor < 0) {
                if (minor == -ENOSPC) {
                        dev_err(&connection->dev,
                                "no more free minor numbers\n");
                        retval = -ENODEV;
-                       goto error_version;
+                       goto error_minor;
                }
                retval = minor;
-               goto error_version;
+               goto error_minor;
        }
 
        gb_tty->minor = minor;
@@ -674,7 +664,7 @@ static int gb_uart_connection_init(struct gb_connection *connection)
 error:
        tty_port_destroy(&gb_tty->port);
        release_minor(gb_tty);
-error_version:
+error_minor:
        connection->private = NULL;
        kfree(gb_tty->buffer);
 error_payload: