diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2014-10-23 17:15:18 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-23 10:39:18 +0100 |
| commit | 00d647b081b5ef2193fd15910fbd103f483a5d15 (patch) | |
| tree | c49c46d90c10c8084f262258c09b46ad68f26665 /sound/soc/soc-jack.c | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| download | lwn-00d647b081b5ef2193fd15910fbd103f483a5d15.tar.gz lwn-00d647b081b5ef2193fd15910fbd103f483a5d15.zip | |
ASoC: jack: 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>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index ab47fea997a3..f921d0098518 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -309,7 +309,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, /* GPIO descriptor */ gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev, gpios[i].name, - gpios[i].idx); + gpios[i].idx, GPIOD_IN); if (IS_ERR(gpios[i].desc)) { ret = PTR_ERR(gpios[i].desc); dev_err(gpios[i].gpiod_dev, @@ -327,17 +327,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, goto undo; } - ret = gpio_request(gpios[i].gpio, gpios[i].name); + ret = gpio_request_one(gpios[i].gpio, GPIOF_IN, + gpios[i].name); if (ret) goto undo; gpios[i].desc = gpio_to_desc(gpios[i].gpio); } - ret = gpiod_direction_input(gpios[i].desc); - if (ret) - goto err; - INIT_DELAYED_WORK(&gpios[i].work, gpio_work); gpios[i].jack = jack; |