regulator: fixed: Remove workaround to handle of_get_named_gpio() return
authorLaxman Dewangan <ldewangan@nvidia.com>
Sun, 13 Mar 2016 13:16:57 +0000 (18:46 +0530)
committerMark Brown <broonie@kernel.org>
Mon, 30 May 2016 15:29:34 +0000 (16:29 +0100)
The GPIO interface of_get_named_gpio() has implemented the proper
error returns even EPROBE_DEFER and hence caller need not to
implement any workaround for translating the returned error.

Remove the workaround implemented to handle the return of
of_get_named_gpio().

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/fixed.c

index ff62d69ba0bedda5a6590e0edee94f4d617fe51a..988a7472c2ab568c3d1c03d1092c0713073a6d28 100644 (file)
@@ -79,18 +79,8 @@ of_get_fixed_voltage_config(struct device *dev,
                config->enabled_at_boot = true;
 
        config->gpio = of_get_named_gpio(np, "gpio", 0);
-       /*
-        * of_get_named_gpio() currently returns ENODEV rather than
-        * EPROBE_DEFER. This code attempts to be compatible with both
-        * for now; the ENODEV check can be removed once the API is fixed.
-        * of_get_named_gpio() doesn't differentiate between a missing
-        * property (which would be fine here, since the GPIO is optional)
-        * and some other error. Patches have been posted for both issues.
-        * Once they are check in, we should replace this with:
-        * if (config->gpio < 0 && config->gpio != -ENOENT)
-        */
-       if ((config->gpio == -ENODEV) || (config->gpio == -EPROBE_DEFER))
-               return ERR_PTR(-EPROBE_DEFER);
+       if ((config->gpio < 0) && (config->gpio != -ENOENT))
+               return ERR_PTR(config->gpio);
 
        of_property_read_u32(np, "startup-delay-us", &config->startup_delay);