|
@@ -2331,9 +2331,6 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
|
|
|
int flow = 'n';
|
|
|
int ret = 0;
|
|
|
|
|
|
- if (!state)
|
|
|
- return -1;
|
|
|
-
|
|
|
tport = &state->port;
|
|
|
mutex_lock(&tport->mutex);
|
|
|
|
|
@@ -2368,13 +2365,12 @@ static int uart_poll_get_char(struct tty_driver *driver, int line)
|
|
|
struct uart_port *port;
|
|
|
int ret = -1;
|
|
|
|
|
|
- if (state) {
|
|
|
- port = uart_port_ref(state);
|
|
|
- if (port) {
|
|
|
- ret = port->ops->poll_get_char(port);
|
|
|
- uart_port_deref(port);
|
|
|
- }
|
|
|
+ port = uart_port_ref(state);
|
|
|
+ if (port) {
|
|
|
+ ret = port->ops->poll_get_char(port);
|
|
|
+ uart_port_deref(port);
|
|
|
}
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -2384,9 +2380,6 @@ static void uart_poll_put_char(struct tty_driver *driver, int line, char ch)
|
|
|
struct uart_state *state = drv->state + line;
|
|
|
struct uart_port *port;
|
|
|
|
|
|
- if (!state)
|
|
|
- return;
|
|
|
-
|
|
|
port = uart_port_ref(state);
|
|
|
if (!port)
|
|
|
return;
|