Merge tag 'perf-tools-for-v5.14-2021-07-10' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-tegra186.c

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 05974b7..d38980b 100644 (file)
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -730,18 +730,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
                offset += port->pins;
        }
 
-       platform_set_drvdata(pdev, gpio);
-
-       err = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio, gpio);
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
-static int tegra186_gpio_remove(struct platform_device *pdev)
-{
-       return 0;
+       return devm_gpiochip_add_data(&pdev->dev, &gpio->gpio, gpio);
 }
 
 #define TEGRA186_MAIN_GPIO_PORT(_name, _bank, _port, _pins)    \
@@ -913,7 +902,6 @@ static struct platform_driver tegra186_gpio_driver = {
                .of_match_table = tegra186_gpio_of_match,
        },
        .probe = tegra186_gpio_probe,
-       .remove = tegra186_gpio_remove,
 };
 module_platform_driver(tegra186_gpio_driver);