]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
power: reset: ltc2952: use _optional variant of devm_gpiod_get
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 18 May 2015 20:45:07 +0000 (22:45 +0200)
committerSebastian Reichel <sre@kernel.org>
Sat, 23 May 2015 18:03:42 +0000 (20:03 +0200)
devm_gpiod_get_optional returns NULL if devm_gpiod_get would return an
ENOENT error pointer.

There is no semantic change intended.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/reset/ltc2952-poweroff.c

index 1e08195551fe7d505511a6dd92b07d1ab4300911..62c91acd6584e9f20aa2fa0e820f18a7b5508469 100644 (file)
@@ -202,16 +202,15 @@ static int ltc2952_poweroff_init(struct platform_device *pdev)
                return ret;
        }
 
-       data->gpio_trigger = devm_gpiod_get(&pdev->dev, "trigger", GPIOD_IN);
+       data->gpio_trigger = devm_gpiod_get_optional(&pdev->dev, "trigger",
+                                                    GPIOD_IN);
        if (IS_ERR(data->gpio_trigger)) {
                /*
                 * It's not a problem if the trigger gpio isn't available, but
                 * it is worth a warning if its use was defined in the device
                 * tree.
                 */
-               if (PTR_ERR(data->gpio_trigger) != -ENOENT)
-                       dev_err(&pdev->dev,
-                               "unable to claim gpio \"trigger\"\n");
+               dev_err(&pdev->dev, "unable to claim gpio \"trigger\"\n");
                data->gpio_trigger = NULL;
        }