summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-tegra186.c
diff options
context:
space:
mode:
authorBartosz Golaszewski <bgolaszewski@baylibre.com>2019-11-12 16:30:17 +0100
committerBartosz Golaszewski <bgolaszewski@baylibre.com>2019-11-12 16:30:17 +0100
commita6e191963f3b367c769d5231e0f3870ed981c6c4 (patch)
tree53878fda4d91ac5a25267cc3dba3e96a930a5418 /drivers/gpio/gpio-tegra186.c
parentMerge remote-tracking branch 'linusw/for-next' into gpio/for-next (diff)
parentnet: caif: Fix debugfs on 64-bit platforms (diff)
downloadlinux-a6e191963f3b367c769d5231e0f3870ed981c6c4.tar.xz
linux-a6e191963f3b367c769d5231e0f3870ed981c6c4.zip
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.c4
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);