diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2017-05-21 11:49:24 +0200 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2017-07-03 08:30:51 +0200 |
| commit | 4076cf08ac7673aca7d4dd9ddf18045d08dbc292 (patch) | |
| tree | 4a76f259c6dcaef5099f5937de13b941babcce21 | |
| parent | 8847f5f9ef554269d2a06100b311d363b9727da6 (diff) | |
| download | linux-4076cf08ac7673aca7d4dd9ddf18045d08dbc292.tar.gz linux-4076cf08ac7673aca7d4dd9ddf18045d08dbc292.tar.bz2 linux-4076cf08ac7673aca7d4dd9ddf18045d08dbc292.zip | |
gpio-exar/8250-exar: Rearrange gpiochip parenthood
Set the parent of the exar gpiochip to its platform device, like other
gpiochips are doing it. In order to keep the relationship discoverable
for ACPI systems, set the platform device companion to the PCI 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>
| -rw-r--r-- | drivers/gpio/gpio-exar.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_exar.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c index f3585a184f39..1a629831d45b 100644 --- a/drivers/gpio/gpio-exar.c +++ b/drivers/gpio/gpio-exar.c @@ -142,7 +142,7 @@ static int gpio_exar_probe(struct platform_device *pdev) sprintf(exar_gpio->name, "exar_gpio%d", index); exar_gpio->gpio_chip.label = exar_gpio->name; - exar_gpio->gpio_chip.parent = &pcidev->dev; + exar_gpio->gpio_chip.parent = &pdev->dev; exar_gpio->gpio_chip.direction_output = exar_direction_output; exar_gpio->gpio_chip.direction_input = exar_direction_input; exar_gpio->gpio_chip.get_direction = exar_get_direction; diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 36877c8ad652..32e3cb58193f 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -9,6 +9,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License. */ +#include <linux/acpi.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> @@ -197,6 +198,7 @@ xr17v35x_register_gpio(struct pci_dev *pcidev) return NULL; pdev->dev.parent = &pcidev->dev; + ACPI_COMPANION_SET(&pdev->dev, ACPI_COMPANION(&pcidev->dev)); if (platform_device_add(pdev) < 0) { platform_device_put(pdev); |