ASoC: rx51: use flags argument of devm_gpiod_get to set direction

Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.

Use this to simplify the driver. Furthermore this is one caller less
that stops us making the flags argument to gpiod_get*() mandatory.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 8 insertions, 22 deletions

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index c2ddf0fbfa28..fded99362d39 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -455,50 +455,36 @@ static int rx51_soc_probe(struct platform_device *pdev)
         snd_soc_card_set_drvdata(card, pdata);
 
         pdata->tvout_selection_gpio = devm_gpiod_get(card->dev,
-                                                     "tvout-selection");
+                                                     "tvout-selection",
+                                                     GPIOD_OUT_LOW);
         if (IS_ERR(pdata->tvout_selection_gpio)) {
                 dev_err(card->dev, "could not get tvout selection gpio\n");
                 return PTR_ERR(pdata->tvout_selection_gpio);
         }
 
-        err = gpiod_direction_output(pdata->tvout_selection_gpio, 0);
-        if (err) {
-                dev_err(card->dev, "could not setup tvout selection gpio\n");
-                return err;
-        }
-
         pdata->jack_detection_gpio = devm_gpiod_get(card->dev,
-                                                    "jack-detection");
+                                                    "jack-detection",
+                                                    GPIOD_ASIS);
         if (IS_ERR(pdata->jack_detection_gpio)) {
                 dev_err(card->dev, "could not get jack detection gpio\n");
                 return PTR_ERR(pdata->jack_detection_gpio);
         }
 
-        pdata->eci_sw_gpio = devm_gpiod_get(card->dev, "eci-switch");
+        pdata->eci_sw_gpio = devm_gpiod_get(card->dev, "eci-switch",
+                                            GPIOD_OUT_HIGH);
         if (IS_ERR(pdata->eci_sw_gpio)) {
                 dev_err(card->dev, "could not get eci switch gpio\n");
                 return PTR_ERR(pdata->eci_sw_gpio);
         }
 
-        err = gpiod_direction_output(pdata->eci_sw_gpio, 1);
-        if (err) {
-                dev_err(card->dev, "could not setup eci switch gpio\n");
-                return err;
-        }
-
         pdata->speaker_amp_gpio = devm_gpiod_get(card->dev,
-                                                 "speaker-amplifier");
+                                                 "speaker-amplifier",
+                                                 GPIOD_OUT_LOW);
         if (IS_ERR(pdata->speaker_amp_gpio)) {
                 dev_err(card->dev, "could not get speaker enable gpio\n");
                 return PTR_ERR(pdata->speaker_amp_gpio);
         }
 
-        err = gpiod_direction_output(pdata->speaker_amp_gpio, 0);
-        if (err) {
-                dev_err(card->dev, "could not setup speaker enable gpio\n");
-                return err;
-        }
-
         err = devm_snd_soc_register_card(card->dev, card);
         if (err) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", err);