]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
8250/fintek: Use rs485 handler from serial_core
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Thu, 6 Nov 2014 08:22:52 +0000 (09:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Nov 2014 22:59:21 +0000 (14:59 -0800)
In order to remove the handler for rs485 ioctls on serial_8250, all the
drivers must use the implementation on serial_core.

Reviewed-by: Alan Cox <alan@linux.intel.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_fintek.c

index 1bb28cb69493af36dc394ace3d0122c7a1bc930c..1e6899bc9429012e177de03b68435ded26c4c6a0 100644 (file)
@@ -89,11 +89,11 @@ static int fintek_8250_check_id(void)
        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)
 {
        uint8_t config = 0;
-       int index = fintek_8250_get_index(uart->port.iobase);
+       int index = fintek_8250_get_index(port->iobase);
 
        if (index < 0)
                return -EINVAL;
@@ -134,6 +134,8 @@ static int fintek_8250_rs4850_config(struct uart_8250_port *uart,
        outb(config, DATA_PORT);
        fintek_8250_exit_key();
 
+       port->rs485 = *rs485;
+
        return 0;
 }
 
@@ -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.iobase = pnp_port_start(dev, 0);
        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;
        if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)