gpio: wm831x: remove platform_set_drvdata() + cleanup probe
authorAlexandru Ardelean <aardelean@deviqon.com>
Mon, 17 May 2021 11:35:38 +0000 (14:35 +0300)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Tue, 25 May 2021 14:20:58 +0000 (16:20 +0200)
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.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
drivers/gpio/gpio-wm831x.c

index a3a32a77041f98e3b30e590c59a9873247fced32..9cf1e5ebb352a71600f1fba45e50fd6168e0cd55 100644 (file)
@@ -261,7 +261,6 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *pdata = &wm831x->pdata;
        struct wm831x_gpio *wm831x_gpio;
-       int ret;
 
        wm831x_gpio = devm_kzalloc(&pdev->dev, sizeof(*wm831x_gpio),
                                   GFP_KERNEL);
@@ -280,16 +279,7 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
        wm831x_gpio->gpio_chip.of_node = wm831x->dev->of_node;
 #endif
 
-       ret = devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip,
-                                    wm831x_gpio);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
-               return ret;
-       }
-
-       platform_set_drvdata(pdev, wm831x_gpio);
-
-       return ret;
+       return devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip, wm831x_gpio);
 }
 
 static struct platform_driver wm831x_gpio_driver = {