aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2017-05-25 02:25:19 -0400
committerJan Kiszka <jan.kiszka@siemens.com>2017-07-03 02:23:09 -0400
commita39f2fe7165647c2cd7bdbebb3d04061035e520f (patch)
treeb715340af6479bad456066e92c30a08f2c2c78e4
parent6697f1f82fba6d23b278222750ffb2de05abc13e (diff)
gpio-exar/8250-exar: Do not even instantiate a GPIO device for Commtech cards
Commtech adapters need the MPIOs for internal purposes, and the gpio-exar driver already refused to pick them up. But there is actually no point in even creating the underlying platform device. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpio/gpio-exar.c3
-rw-r--r--drivers/tty/serial/8250/8250_exar.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c
index 4b46273ca545..139d54008ad0 100644
--- a/drivers/gpio/gpio-exar.c
+++ b/drivers/gpio/gpio-exar.c
@@ -124,9 +124,6 @@ static int gpio_exar_probe(struct platform_device *pdev)
124 void __iomem *p; 124 void __iomem *p;
125 int index, ret; 125 int index, ret;
126 126
127 if (pcidev->vendor != PCI_VENDOR_ID_EXAR)
128 return -ENODEV;
129
130 /* 127 /*
131 * Map the pci device to get the register addresses. 128 * Map the pci device to get the register addresses.
132 * We will need to read and write those registers to control 129 * We will need to read and write those registers to control
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 2adc0f1a2196..36877c8ad652 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -239,7 +239,9 @@ pci_xr17v35x_setup(struct exar8250 *priv, struct pci_dev *pcidev,
239 /* Setup Multipurpose Input/Output pins. */ 239 /* Setup Multipurpose Input/Output pins. */
240 setup_gpio(p); 240 setup_gpio(p);
241 241
242 port->port.private_data = xr17v35x_register_gpio(pcidev); 242 if (pcidev->vendor == PCI_VENDOR_ID_EXAR)
243 port->port.private_data =
244 xr17v35x_register_gpio(pcidev);
243 } 245 }
244 246
245 return 0; 247 return 0;