Merge remote-tracking branch 'tty/tty-next'

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250_pci.c

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 7cd6f9a9054212d905e808bcfba2d76d676aaae2..8f8d5c59c8181e88e6ad1d29e11fd80f579649b0 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -721,7 +721,7 @@ static int pci_ni8430_init(struct pci_dev *dev)
         */
        pcibios_resource_to_bus(dev->bus, &region, &dev->resource[bar]);
        device_window = ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00)
-                       | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;
+                       | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;
        writel(device_window, p + MITE_IOWBSR1);
 
        /* Set window access to go to RAMSEL IO address space */
@@ -803,12 +803,12 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)
        unsigned int pi;
        unsigned short sub_serports;
 
-       pi = (c & 0xff);
+       pi = c & 0xff;
 
-       if (pi == 2) {
+       if (pi == 2)
                return 1;
-       } else if ((pi == 0) &&
-                          (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {
+
+       if ((pi == 0) && (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {
                /* two possibilities: 0x30ps encodes number of parallel and
                 * serial ports, or 0x1000 indicates *something*. This is not
                 * immediately obvious, since the 2s1p+4s configuration seems
@@ -816,12 +816,12 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)
                 * advertising the same function 3 as the 4s+2s1p config.
                 */
                sub_serports = dev->subsystem_device & 0xf;
-               if (sub_serports > 0) {
+               if (sub_serports > 0)
                        return sub_serports;
-               } else {
-                       dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
-                       return 0;
-               }
+
+               dev_err(&dev->dev,
+                       "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
+               return 0;
        }
 
        moan_device("unknown NetMos/Mostech program interface", dev);
@@ -842,21 +842,21 @@ static int pci_netmos_init(struct pci_dev *dev)
                return 0;
 
        switch (dev->device) { /* FALLTHROUGH on all */
-               case PCI_DEVICE_ID_NETMOS_9904:
-               case PCI_DEVICE_ID_NETMOS_9912:
-               case PCI_DEVICE_ID_NETMOS_9922:
-               case PCI_DEVICE_ID_NETMOS_9900:
-                       num_serial = pci_netmos_9900_numports(dev);
-                       break;
+       case PCI_DEVICE_ID_NETMOS_9904:
+       case PCI_DEVICE_ID_NETMOS_9912:
+       case PCI_DEVICE_ID_NETMOS_9922:
+       case PCI_DEVICE_ID_NETMOS_9900:
+               num_serial = pci_netmos_9900_numports(dev);
+               break;
 
-               default:
-                       if (num_serial == 0 ) {
-                               moan_device("unknown NetMos/Mostech device", dev);
-                       }
+       default:
+               break;
        }
 
-       if (num_serial == 0)
+       if (num_serial == 0) {
+               moan_device("unknown NetMos/Mostech device", dev);
                return -ENODEV;
+       }
 
        return num_serial;
 }
@@ -1198,8 +1198,9 @@ static int pci_quatech_has_qmcr(struct uart_8250_port *port)
 
 static int pci_quatech_test(struct uart_8250_port *port)
 {
-       u8 reg;
-       u8 qopr = pci_quatech_rqopr(port);
+       u8 reg, qopr;
+
+       qopr = pci_quatech_rqopr(port);
        pci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);
        reg = pci_quatech_rqopr(port) & 0xC0;
        if (reg != QPCR_TEST_GET1)
@@ -1286,6 +1287,7 @@ static int pci_quatech_init(struct pci_dev *dev)
                unsigned long base = pci_resource_start(dev, 0);
                if (base) {
                        u32 tmp;
+
                        outl(inl(base + 0x38) | 0x00002000, base + 0x38);
                        tmp = inl(base + 0x3c);
                        outl(tmp | 0x01000000, base + 0x3c);
@@ -1334,29 +1336,6 @@ static int pci_default_setup(struct serial_private *priv,
        return setup_port(priv, port, bar, offset, board->reg_shift);
 }
 
-static int pci_pericom_setup(struct serial_private *priv,
-                 const struct pciserial_board *board,
-                 struct uart_8250_port *port, int idx)
-{
-       unsigned int bar, offset = board->first_offset, maxnr;
-
-       bar = FL_GET_BASE(board->flags);
-       if (board->flags & FL_BASE_BARS)
-               bar += idx;
-       else
-               offset += idx * board->uart_offset;
-
-       maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) >>
-               (board->reg_shift + 3);
-
-       if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
-               return 1;
-
-       port->port.uartclk = 14745600;
-
-       return setup_port(priv, port, bar, offset, board->reg_shift);
-}
-
 static int
 ce4100_serial_setup(struct serial_private *priv,
                  const struct pciserial_board *board,
@@ -1541,10 +1520,9 @@ pci_brcm_trumanage_setup(struct serial_private *priv,
 static int pci_fintek_rs485_config(struct uart_port *port,
                               struct serial_rs485 *rs485)
 {
+       struct pci_dev *pci_dev = to_pci_dev(port->dev);
        u8 setting;
        u8 *index = (u8 *) port->private_data;
-       struct pci_dev *pci_dev = container_of(port->dev, struct pci_dev,
-                                               dev);
 
        pci_read_config_byte(pci_dev, 0x40 + 8 * *index + 7, &setting);
 
@@ -1766,7 +1744,7 @@ xr17v35x_has_slave(struct serial_private *priv)
        const int dev_id = priv->dev->device;
 
        return ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) ||
-               (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));
+               (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));
 }
 
 static int
@@ -1866,8 +1844,8 @@ pci_fastcom335_setup(struct serial_private *priv,
 
 static int
 pci_wch_ch353_setup(struct serial_private *priv,
-                    const struct pciserial_board *board,
-                    struct uart_8250_port *port, int idx)
+                   const struct pciserial_board *board,
+                   struct uart_8250_port *port, int idx)
 {
        port->port.flags |= UPF_FIXED_TYPE;
        port->port.type = PORT_16550A;
@@ -1876,8 +1854,8 @@ pci_wch_ch353_setup(struct serial_private *priv,
 
 static int
 pci_wch_ch38x_setup(struct serial_private *priv,
-                    const struct pciserial_board *board,
-                    struct uart_8250_port *port, int idx)
+                   const struct pciserial_board *board,
+                   struct uart_8250_port *port, int idx)
 {
        port->port.flags |= UPF_FIXED_TYPE;
        port->port.type = PORT_16850;
@@ -2245,16 +2223,6 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                .setup          = pci_default_setup,
                .exit           = pci_plx9050_exit,
        },
-       /*
-        * Pericom
-        */
-       {
-               .vendor         = PCI_VENDOR_ID_PERICOM,
-               .device         = PCI_ANY_ID,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = PCI_ANY_ID,
-               .setup          = pci_pericom_setup,
-       },
        /*
         * PLX
         */
@@ -4538,7 +4506,7 @@ static struct pci_device_id serial_pci_tbl[] = {
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b0_bt_2_921600 },
        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
-               PCI_ANY_ID , PCI_ANY_ID, 0, 0,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b2_8_1152000 },
 
        /*