redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Viresh Kumar 2015-08-11 07:36:11 +05:30 committed by Greg Kroah-Hartman
parent 3fb0c8f516
commit a94e144864
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/greybus/uart.c
View File

@ -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: