| Message ID | 1449753107-11410-2-git-send-email-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/12/15 15:11, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > gpiod_set_value_cansleep is a noop when the passed descriptor is NULL. > So there is no need to duplicate the check for NULL; just call the > function unconditionally instead. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c > index 06b6e611e4b2..e780fd4f8b46 100644 > --- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c > +++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c > @@ -83,8 +83,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) > if (r) > return r; > > - if (ddata->enable_gpio) > - gpiod_set_value_cansleep(ddata->enable_gpio, 1); > + gpiod_set_value_cansleep(ddata->enable_gpio, 1); > > if (gpio_is_valid(ddata->backlight_gpio)) > gpio_set_value_cansleep(ddata->backlight_gpio, 1); > @@ -105,8 +104,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev) > if (gpio_is_valid(ddata->backlight_gpio)) > gpio_set_value_cansleep(ddata->backlight_gpio, 0); > > - if (ddata->enable_gpio) > - gpiod_set_value_cansleep(ddata->enable_gpio, 0); > + gpiod_set_value_cansleep(ddata->enable_gpio, 0); > > in->ops.dpi->disable(in); > > Thanks, queued for 4.5. Tomi
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c index 06b6e611e4b2..e780fd4f8b46 100644 --- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c +++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c @@ -83,8 +83,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) if (r) return r; - if (ddata->enable_gpio) - gpiod_set_value_cansleep(ddata->enable_gpio, 1); + gpiod_set_value_cansleep(ddata->enable_gpio, 1); if (gpio_is_valid(ddata->backlight_gpio)) gpio_set_value_cansleep(ddata->backlight_gpio, 1); @@ -105,8 +104,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev) if (gpio_is_valid(ddata->backlight_gpio)) gpio_set_value_cansleep(ddata->backlight_gpio, 0); - if (ddata->enable_gpio) - gpiod_set_value_cansleep(ddata->enable_gpio, 0); + gpiod_set_value_cansleep(ddata->enable_gpio, 0); in->ops.dpi->disable(in);