diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-11 07:36:11 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-08-11 19:33:05 -0700 |
| commit | a94e14486477b5738061ac09ab69025985c1eda5 (patch) | |
| tree | 2507190e48fc2da93026c29390fe685e7bd638f8 /drivers/staging/greybus/uart.c | |
| parent | 3fb0c8f516e06cb3bc39610aeb1311b8376bdc61 (diff) | |
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>
Diffstat (limited to 'drivers/staging/greybus/uart.c')
| -rw-r--r-- | drivers/staging/greybus/uart.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 7a51c7c792c9..9e8bf6f4b8d7 100644 --- 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: |