Skip to contentSkip to conversation

gpio: gpio-tegra186: remove empty remove hook

PATCH In review Alexandru Ardelean 2 participants 3 messages May 15, 2021 – May 23, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gpio: gpio-tegra186: remove empty remove hook

The tegra186_gpio_remove hook simply does a return 0. Not defining it yields pretty much the same result. So, this can be removed.

---
 drivers/gpio/gpio-tegra186.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/gpio/gpio-tegra186.c +0 -6
index 1bd9e44df718..10d3597e9ac2 100644
@@ -750,11 +750,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int tegra186_gpio_remove(struct platform_device *pdev)
-{
-	return 0;
-}
-
 #define TEGRA186_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
 	[TEGRA186_MAIN_GPIO_PORT_##_name] = {			\
 		.name = #_name,					\
@@ -924,7 +919,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);
 
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/2 gpio: gpio-tegra186: remove platform_set_drvdata() + cleanup probe

The platform_set_drvdata() call is only useful if we need to retrieve back the private information.
Since the driver doesn't do that, it's not useful to have it.

If this is removed, we can also just do a direct return on devm_gpiochip_add_data(). We don't need to print that this call failed as there are other ways to log/see this during probe.

---
 drivers/gpio/gpio-tegra186.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpio/gpio-tegra186.c +1 -7
index 10d3597e9ac2..f54ae9d4254a 100644
@@ -741,13 +741,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;
+	return devm_gpiochip_add_data(&pdev->dev, &gpio->gpio, gpio);
 }
 
 #define TEGRA186_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
Signature · 1 line
2.31.1
#2 lore raw

Re: [PATCH 2/2] gpio: gpio-tegra186: remove platform_set_drvdata() + cleanup probe

Quoted 34 lines · Alexandru Ardelean

The platform_set_drvdata() call is only useful if we need to retrieve back the private information.
Since the driver doesn't do that, it's not useful to have it.

If this is removed, we can also just do a direct return on devm_gpiochip_add_data(). We don't need to print that this call failed as there are other ways to log/see this during probe.

---
 drivers/gpio/gpio-tegra186.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpio/gpio-tegra186.c +1 -8
index 10d3597e9ac2..f54ae9d4254a 100644
@@ -741,13 +741,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;
+       return devm_gpiochip_add_data(&pdev->dev, &gpio->gpio, gpio);
 }
 
 #define TEGRA186_MAIN_GPIO_PORT(_name, _bank, _port, _pins)    \
--
Quoted 2 lines

2.31.1

Normally I'd wait for Thierry's Ack but this cleanup is pretty straightforward so I applied both patches.

Bart