Skip to contentSkip to conversation

gpio: gpio-tps68470: remove platform_set_drvdata() + cleanup probe

PATCH Applied Alexandru Ardelean 2 participants 3 messages May 14, 2021 – May 21, 2021 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: gpio-tps68470: 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-tps68470.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpio/gpio-tps68470.c +1 -11
index f7f5f770e0fb..423b7bc30ae8 100644
@@ -125,7 +125,6 @@ static const char *tps68470_names[TPS68470_N_GPIO] = {
 static int tps68470_gpio_probe(struct platform_device *pdev)
 {
 	struct tps68470_gpio_data *tps68470_gpio;
-	int ret;
 
 	tps68470_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps68470_gpio),
 				     GFP_KERNEL);
@@ -146,16 +145,7 @@ static int tps68470_gpio_probe(struct platform_device *pdev)
 	tps68470_gpio->gc.base = -1;
 	tps68470_gpio->gc.parent = &pdev->dev;
 
-	ret = devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc,
-				     tps68470_gpio);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "Failed to register gpio_chip: %d\n", ret);
-		return ret;
-	}
-
-	platform_set_drvdata(pdev, tps68470_gpio);
-
-	return ret;
+	return devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc, tps68470_gpio);
 }
 
 static struct platform_driver tps68470_gpio_driver = {
Signature · 1 line
2.31.1
#1 lore raw
Quoted 45 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-tps68470.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpio/gpio-tps68470.c +1 -12
index f7f5f770e0fb..423b7bc30ae8 100644
@@ -125,7 +125,6 @@ static const char *tps68470_names[TPS68470_N_GPIO] = {
 static int tps68470_gpio_probe(struct platform_device *pdev)
 {
        struct tps68470_gpio_data *tps68470_gpio;
-       int ret;
 
        tps68470_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps68470_gpio),
                                     GFP_KERNEL);
@@ -146,16 +145,7 @@ static int tps68470_gpio_probe(struct platform_device *pdev)
        tps68470_gpio->gc.base = -1;
        tps68470_gpio->gc.parent = &pdev->dev;
 
-       ret = devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc,
-                                    tps68470_gpio);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to register gpio_chip: %d\n", ret);
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, tps68470_gpio);
-
-       return ret;
+       return devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc, tps68470_gpio);
 }
 
 static struct platform_driver tps68470_gpio_driver = {
--
Quoted 2 lines

2.31.1

Applied. I got confused by the dev_get_drvdata() call earlier in probe but this one's for the parent.

Thanks,
Bart

#2 lore raw
Quoted 46 lines · Bartosz Golaszewski
Quoted 43 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-tps68470.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpio/gpio-tps68470.c +1 -11
index f7f5f770e0fb..423b7bc30ae8 100644
@@ -125,7 +125,6 @@ static const char *tps68470_names[TPS68470_N_GPIO] = {
 static int tps68470_gpio_probe(struct platform_device *pdev)
 {
        struct tps68470_gpio_data *tps68470_gpio;
-       int ret;
 
        tps68470_gpio = devm_kzalloc(&pdev->dev, sizeof(*tps68470_gpio),
                                     GFP_KERNEL);
@@ -146,16 +145,7 @@ static int tps68470_gpio_probe(struct platform_device *pdev)
        tps68470_gpio->gc.base = -1;
        tps68470_gpio->gc.parent = &pdev->dev;
 
-       ret = devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc,
-                                    tps68470_gpio);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to register gpio_chip: %d\n", ret);
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, tps68470_gpio);
-
-       return ret;
+       return devm_gpiochip_add_data(&pdev->dev, &tps68470_gpio->gc, tps68470_gpio);
 }
 
Quoted 7 lines
Quoted 4 lines
drivers/gpio/gpio-tps68470.c +0 -1
 static struct platform_driver tps68470_gpio_driver = {
--

2.31.1

Applied. I got confused by the dev_get_drvdata() call earlier in probe but this one's for the parent.

Yes.
I initially got confused as well about it.

This pattern seems to be similar in other drivers as well; usually MFD devices.

Quoted 3 lines

Thanks,
Bart