Skip to contentSkip to conversation

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

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: gpio-tps65910: 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-tps65910.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpio/gpio-tps65910.c +2 -10
index 0c0b445c75c0..7fa8c841081f 100644
@@ -165,16 +165,8 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
 	}
 
 skip_init:
-	ret = devm_gpiochip_add_data(&pdev->dev, &tps65910_gpio->gpio_chip,
-				     tps65910_gpio);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
-		return ret;
-	}
-
-	platform_set_drvdata(pdev, tps65910_gpio);
-
-	return ret;
+	return devm_gpiochip_add_data(&pdev->dev, &tps65910_gpio->gpio_chip,
+				      tps65910_gpio);
 }
 
 static struct platform_driver tps65910_gpio_driver = {
Signature · 1 line
2.31.1
#1 lore raw
Quoted 38 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-tps65910.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpio/gpio-tps65910.c +2 -11
index 0c0b445c75c0..7fa8c841081f 100644
@@ -165,16 +165,8 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
        }
 
 skip_init:
-       ret = devm_gpiochip_add_data(&pdev->dev, &tps65910_gpio->gpio_chip,
-                                    tps65910_gpio);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, tps65910_gpio);
-
-       return ret;
+       return devm_gpiochip_add_data(&pdev->dev, &tps65910_gpio->gpio_chip,
+                                     tps65910_gpio);
 }
 
 static struct platform_driver tps65910_gpio_driver = {
--
Quoted 2 lines

2.31.1

Applied, thanks!

Bart