| Message ID | 1406299645-29043-1-git-send-email-acourbot@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Ping, Thierry? On Fri, Jul 25, 2014 at 11:47 PM, Alexandre Courbot <acourbot@nvidia.com> wrote: > Use the new devm_gpiod_get_optional() to simplify the probe code. > > Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> > --- > drivers/gpu/drm/panel/panel-simple.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c > index a251361..91bf566 100644 > --- a/drivers/gpu/drm/panel/panel-simple.c > +++ b/drivers/gpu/drm/panel/panel-simple.c > @@ -185,16 +185,14 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) > if (IS_ERR(panel->supply)) > return PTR_ERR(panel->supply); > > - panel->enable_gpio = devm_gpiod_get(dev, "enable"); > + panel->enable_gpio = devm_gpiod_get_optional(dev, "enable"); > if (IS_ERR(panel->enable_gpio)) { > err = PTR_ERR(panel->enable_gpio); > - if (err != -ENOENT) { > - dev_err(dev, "failed to request GPIO: %d\n", err); > - return err; > - } > + dev_err(dev, "failed to request GPIO: %d\n", err); > + return err; > + } > > - panel->enable_gpio = NULL; > - } else { > + if (panel->enable_gpio) { > err = gpiod_direction_output(panel->enable_gpio, 0); > if (err < 0) { > dev_err(dev, "failed to setup GPIO: %d\n", err); > -- > 2.0.2 >
On Fri, Jul 25, 2014 at 11:47:25PM +0900, Alexandre Courbot wrote: > Use the new devm_gpiod_get_optional() to simplify the probe code. > > Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> > --- > drivers/gpu/drm/panel/panel-simple.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) For some reason I thought I had already applied this, but apparently I was mistaken. Applied now, thanks. Thierry
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index a251361..91bf566 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -185,16 +185,14 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) if (IS_ERR(panel->supply)) return PTR_ERR(panel->supply); - panel->enable_gpio = devm_gpiod_get(dev, "enable"); + panel->enable_gpio = devm_gpiod_get_optional(dev, "enable"); if (IS_ERR(panel->enable_gpio)) { err = PTR_ERR(panel->enable_gpio); - if (err != -ENOENT) { - dev_err(dev, "failed to request GPIO: %d\n", err); - return err; - } + dev_err(dev, "failed to request GPIO: %d\n", err); + return err; + } - panel->enable_gpio = NULL; - } else { + if (panel->enable_gpio) { err = gpiod_direction_output(panel->enable_gpio, 0); if (err < 0) { dev_err(dev, "failed to setup GPIO: %d\n", err);
Use the new devm_gpiod_get_optional() to simplify the probe code. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> --- drivers/gpu/drm/panel/panel-simple.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)