iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: io_ti: move port initialisation to probe

Browse Source 
Move port initialisation code from open to probe where it belongs.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-06-26 16:47:38 +02:00 committed by Greg Kroah-Hartman
parent ddca16e4f1
commit 0fce06da6b
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/usb/serial/io_ti.c
View File

@ -1729,22 +1729,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
return -ENODEV; return -ENODEV;
port_number = port->port_number; port_number = port->port_number;
switch (port_number) {
case 0:
edge_port->uart_base = UMPMEM_BASE_UART1;
edge_port->dma_address = UMPD_OEDB1_ADDRESS;
break;
case 1:
edge_port->uart_base = UMPMEM_BASE_UART2;
edge_port->dma_address = UMPD_OEDB2_ADDRESS;
break;
default:
dev_err(&port->dev, "Unknown port number!!!\n");
return -ENODEV;
}
dev_dbg(&port->dev, "%s - port_number = %d, uart_base = %04x, dma_address = %04x\n",
__func__, port_number, edge_port->uart_base, edge_port->dma_address);
dev = port->serial->dev; dev = port->serial->dev;
@ -2451,18 +2435,40 @@ static int edge_port_probe(struct usb_serial_port *port)
edge_port->edge_serial = usb_get_serial_data(port->serial); edge_port->edge_serial = usb_get_serial_data(port->serial);
edge_port->bUartMode = default_uart_mode; edge_port->bUartMode = default_uart_mode;
switch (port->port_number) {
case 0:
edge_port->uart_base = UMPMEM_BASE_UART1;
edge_port->dma_address = UMPD_OEDB1_ADDRESS;
break;
case 1:
edge_port->uart_base = UMPMEM_BASE_UART2;
edge_port->dma_address = UMPD_OEDB2_ADDRESS;
break;
default:
dev_err(&port->dev, "unknown port number\n");
ret = -ENODEV;
goto err;
}
dev_dbg(&port->dev,
"%s - port_number = %d, uart_base = %04x, dma_address = %04x\n",
__func__, port->port_number, edge_port->uart_base,
edge_port->dma_address);
usb_set_serial_port_data(port, edge_port); usb_set_serial_port_data(port, edge_port);
ret = edge_create_sysfs_attrs(port); ret = edge_create_sysfs_attrs(port);
if (ret) { if (ret)
kfree(edge_port); goto err;
return ret;
}
port->port.closing_wait = msecs_to_jiffies(closing_wait * 10); port->port.closing_wait = msecs_to_jiffies(closing_wait * 10);
port->port.drain_delay = 1; port->port.drain_delay = 1;
return 0; return 0;
err:
kfree(edge_port);
return ret;
} }
static int edge_port_remove(struct usb_serial_port *port) static int edge_port_remove(struct usb_serial_port *port)