aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hung <hpeter@gmail.com>2015-03-17 06:02:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 17:23:26 -0400
commit77002c6f95cc2b51284f6f855da2c19e911f837a (patch)
treee067313ee3e1e145ede8e877f90565d50d160cdf
parente4228d7cf5844776bfe7c1a466fc827530c0086f (diff)
serial: 8250_pci: remove non-used var for F81504
Remove pci_fintek_setup() non-used var with calculation ciobase Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_pci.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 11784e9ad9c2..495da0643278 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1693,9 +1693,7 @@ static int pci_fintek_setup(struct serial_private *priv,
1693 struct uart_8250_port *port, int idx) 1693 struct uart_8250_port *port, int idx)
1694{ 1694{
1695 struct pci_dev *pdev = priv->dev; 1695 struct pci_dev *pdev = priv->dev;
1696 unsigned long base;
1697 unsigned long iobase; 1696 unsigned long iobase;
1698 unsigned long ciobase = 0;
1699 u8 config_base; 1697 u8 config_base;
1700 u32 bar_data[3]; 1698 u32 bar_data[3];
1701 1699
@@ -1744,11 +1742,6 @@ static int pci_fintek_setup(struct serial_private *priv,
1744 return -EINVAL; 1742 return -EINVAL;
1745 } 1743 }
1746 1744
1747 if (idx < 4) {
1748 base = pci_resource_start(priv->dev, 3);
1749 ciobase = (int)(base + (0x8 * idx));
1750 }
1751
1752 /* Get the io address dispatch from the BIOS */ 1745 /* Get the io address dispatch from the BIOS */
1753 pci_read_config_dword(pdev, 0x24, &bar_data[0]); 1746 pci_read_config_dword(pdev, 0x24, &bar_data[0]);
1754 pci_read_config_dword(pdev, 0x20, &bar_data[1]); 1747 pci_read_config_dword(pdev, 0x20, &bar_data[1]);
@@ -1757,8 +1750,8 @@ static int pci_fintek_setup(struct serial_private *priv,
1757 /* Calculate Real IO Port */ 1750 /* Calculate Real IO Port */
1758 iobase = (bar_data[idx/4] & 0xffffffe0) + (idx % 4) * 8; 1751 iobase = (bar_data[idx/4] & 0xffffffe0) + (idx % 4) * 8;
1759 1752
1760 dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%lx ciobase=0x%lx config_base=0x%2x\n", 1753 dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%lx config_base=0x%2x\n",
1761 __func__, idx, iobase, ciobase, config_base); 1754 __func__, idx, iobase, config_base);
1762 1755
1763 /* Enable UART I/O port */ 1756 /* Enable UART I/O port */
1764 pci_write_config_byte(pdev, config_base + 0x00, 0x01); 1757 pci_write_config_byte(pdev, config_base + 0x00, 0x01);