| Message ID | 63100617e55d78ab881baaa6baf44e8d74d0e816.1496388533.git.jan.kiszka@siemens.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 2, 2017 at 9:28 AM, Jan Kiszka <jan.kiszka@siemens.com> wrote: > This fixes reloading of the GPIO driver for the same platform device > instance as created by the exar UART driver: First of all, the driver > sets drvdata to its own value during probing and does not restore the > original value on exit. But this won't help anyway as the core clears > drvdata after the driver left. > > Set the platform device parent instead. > > 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> If I get Gregs ACK on this I can merge patches 2-11 through the GPIO tree. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2017-06-09 09:21, Linus Walleij wrote: > On Fri, Jun 2, 2017 at 9:28 AM, Jan Kiszka <jan.kiszka@siemens.com> wrote: > >> This fixes reloading of the GPIO driver for the same platform device >> instance as created by the exar UART driver: First of all, the driver >> sets drvdata to its own value during probing and does not restore the >> original value on exit. But this won't help anyway as the core clears >> drvdata after the driver left. >> >> Set the platform device parent instead. >> >> 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> > > If I get Gregs ACK on this I can merge patches 2-11 through the > GPIO tree. > Patch 10 needs an update, Andy had remarks. I need to resync and send it - there will be v6 soon. Thanks, Jan
On Fri, Jun 02, 2017 at 09:28:46AM +0200, Jan Kiszka wrote: > This fixes reloading of the GPIO driver for the same platform device > instance as created by the exar UART driver: First of all, the driver > sets drvdata to its own value during probing and does not restore the > original value on exit. But this won't help anyway as the core clears > drvdata after the driver left. > > Set the platform device parent instead. > > 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> -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c index 006a9a67c2a4..da4550bb9939 100644 --- a/drivers/gpio/gpio-exar.c +++ b/drivers/gpio/gpio-exar.c @@ -119,7 +119,7 @@ static int exar_direction_input(struct gpio_chip *chip, unsigned int offset) static int gpio_exar_probe(struct platform_device *pdev) { - struct pci_dev *pcidev = platform_get_drvdata(pdev); + struct pci_dev *pcidev = to_pci_dev(pdev->dev.parent); struct exar_gpio_chip *exar_gpio; void __iomem *p; int index, ret; diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index c29c7e675890..0f4b236d7e68 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -203,7 +203,8 @@ xr17v35x_register_gpio(struct pci_dev *pcidev) if (!pdev) return NULL; - platform_set_drvdata(pdev, pcidev); + pdev->dev.parent = &pcidev->dev; + if (platform_device_add(pdev) < 0) { platform_device_put(pdev); return NULL;