Commit 41e69093 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Greg Kroah-Hartman

8250/fintek: Use rs485 handler from serial_core

In order to remove the handler for rs485 ioctls on serial_8250, all the
drivers must use the implementation on serial_core.
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46c55b4b
...@@ -89,11 +89,11 @@ static int fintek_8250_check_id(void) ...@@ -89,11 +89,11 @@ static int fintek_8250_check_id(void)
return 0; return 0;
} }
static int fintek_8250_rs4850_config(struct uart_8250_port *uart, static int fintek_8250_rs485_config(struct uart_port *port,
struct serial_rs485 *rs485) struct serial_rs485 *rs485)
{ {
uint8_t config = 0; uint8_t config = 0;
int index = fintek_8250_get_index(uart->port.iobase); int index = fintek_8250_get_index(port->iobase);
if (index < 0) if (index < 0)
return -EINVAL; return -EINVAL;
...@@ -134,6 +134,8 @@ static int fintek_8250_rs4850_config(struct uart_8250_port *uart, ...@@ -134,6 +134,8 @@ static int fintek_8250_rs4850_config(struct uart_8250_port *uart,
outb(config, DATA_PORT); outb(config, DATA_PORT);
fintek_8250_exit_key(); fintek_8250_exit_key();
port->rs485 = *rs485;
return 0; return 0;
} }
...@@ -166,7 +168,7 @@ fintek_8250_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) ...@@ -166,7 +168,7 @@ fintek_8250_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
uart.port.irq = pnp_irq(dev, 0); uart.port.irq = pnp_irq(dev, 0);
uart.port.iobase = pnp_port_start(dev, 0); uart.port.iobase = pnp_port_start(dev, 0);
uart.port.iotype = UPIO_PORT; uart.port.iotype = UPIO_PORT;
uart.rs485_config = fintek_8250_rs4850_config; uart.port.rs485_config = fintek_8250_rs485_config;
uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF; uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE) if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment