diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-23 04:16:58 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-06 03:50:56 -0500 |
commit | a61400d85c3ba4c8e83fd7a6e610b2af0136a94a (patch) | |
tree | cdc7ad8c83cb31daac3d2accf53bbaf860ee1117 /drivers/gpu/drm/panel/panel-simple.c | |
parent | 26c2ad8a49dffcb6bdae447dc7c02db81323dbf7 (diff) |
drm/panel: simple: Update calls to gpiod_get*()
Add the new flags argument to calls of (devm_)gpiod_get*() and remove
any direction setting code afterwards.
Currently both forms (with or without the flags argument) are valid
thanks to transitional macros in <linux/gpio/consumer.h>. These macros
will be removed once all consumers are updated and the flags argument
will become compulsary.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Andrzej Hajda <a.hajda@samsung.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.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 23de22f8c820..83d93062930d 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c | |||
@@ -247,21 +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_optional(dev, "enable"); | 250 | panel->enable_gpio = devm_gpiod_get_optional(dev, "enable", |
251 | GPIOD_OUT_LOW); | ||
251 | if (IS_ERR(panel->enable_gpio)) { | 252 | if (IS_ERR(panel->enable_gpio)) { |
252 | err = PTR_ERR(panel->enable_gpio); | 253 | err = PTR_ERR(panel->enable_gpio); |
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 | } |
256 | 257 | ||
257 | if (panel->enable_gpio) { | ||
258 | err = gpiod_direction_output(panel->enable_gpio, 0); | ||
259 | if (err < 0) { | ||
260 | dev_err(dev, "failed to setup GPIO: %d\n", err); | ||
261 | return err; | ||
262 | } | ||
263 | } | ||
264 | |||
265 | backlight = of_parse_phandle(dev->of_node, "backlight", 0); | 258 | backlight = of_parse_phandle(dev->of_node, "backlight", 0); |
266 | if (backlight) { | 259 | if (backlight) { |
267 | panel->backlight = of_find_backlight_by_node(backlight); | 260 | panel->backlight = of_find_backlight_by_node(backlight); |