aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/panel/panel-simple.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-07-25 10:47:25 -0400
committerThierry Reding <treding@nvidia.com>2014-08-07 03:35:27 -0400
commit9746c61960b63d2cea41333bca00c60f032052bb (patch)
tree713eda3d17b320396b9b6eef9a426b09c972569b /drivers/gpu/drm/panel/panel-simple.c
parent77df01dcd3040a7d664d85d085d4a21533824bc1 (diff)
drm/panel: simple: Use devm_gpiod_get_optional()
Use the new devm_gpiod_get_optional() to simplify the probe code. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/panel/panel-simple.c')
-rw-r--r--drivers/gpu/drm/panel/panel-simple.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 6ae1aada6373..4ce1db0a68ff 100644
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -247,16 +247,14 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
247 if (IS_ERR(panel->supply)) 247 if (IS_ERR(panel->supply))
248 return PTR_ERR(panel->supply); 248 return PTR_ERR(panel->supply);
249 249
250 panel->enable_gpio = devm_gpiod_get(dev, "enable"); 250 panel->enable_gpio = devm_gpiod_get_optional(dev, "enable");
251 if (IS_ERR(panel->enable_gpio)) { 251 if (IS_ERR(panel->enable_gpio)) {
252 err = PTR_ERR(panel->enable_gpio); 252 err = PTR_ERR(panel->enable_gpio);
253 if (err != -ENOENT) { 253 dev_err(dev, "failed to request GPIO: %d\n", err);
254 dev_err(dev, "failed to request GPIO: %d\n", err); 254 return err;
255 return err; 255 }
256 }
257 256
258 panel->enable_gpio = NULL; 257 if (panel->enable_gpio) {
259 } else {
260 err = gpiod_direction_output(panel->enable_gpio, 0); 258 err = gpiod_direction_output(panel->enable_gpio, 0);
261 if (err < 0) { 259 if (err < 0) {
262 dev_err(dev, "failed to setup GPIO: %d\n", err); 260 dev_err(dev, "failed to setup GPIO: %d\n", err);