diff options
| author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-11-12 16:30:17 +0100 |
|---|---|---|
| committer | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-11-12 16:30:17 +0100 |
| commit | a6e191963f3b367c769d5231e0f3870ed981c6c4 (patch) | |
| tree | 53878fda4d91ac5a25267cc3dba3e96a930a5418 /drivers/gpio/gpio-tegra186.c | |
| parent | 5be85ec0de8425fb22c7b38fbaf4f245e41a5dca (diff) | |
| parent | b52517e456f8bb6ae720feab891af6d5b8a8f217 (diff) | |
| download | linux-a6e191963f3b367c769d5231e0f3870ed981c6c4.tar.bz2 | |
Merge remote-tracking branch 'driver-core/driver-core-next' into gpio/for-next
Diffstat (limited to 'drivers/gpio/gpio-tegra186.c')
| -rw-r--r-- | drivers/gpio/gpio-tegra186.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c index 57185b96c110..934ab3605849 100644 --- a/drivers/gpio/gpio-tegra186.c +++ b/drivers/gpio/gpio-tegra186.c @@ -450,7 +450,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev) struct gpio_irq_chip *irq; struct tegra_gpio *gpio; struct device_node *np; - struct resource *res; char **names; int err; @@ -460,8 +459,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->soc = of_device_get_match_data(&pdev->dev); - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio"); - gpio->base = devm_ioremap_resource(&pdev->dev, res); + gpio->base = devm_platform_ioremap_resource_byname(pdev, "gpio"); if (IS_ERR(gpio->base)) return PTR_ERR(gpio->base); |