evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: jack: update calls to gpiod_get*()

Browse source 
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>
This commit is contained in:
Alexandre Courbot 2014-10-23 17:15:18 +09:00 • committed by Mark Brown
parent f114040e3e
commit 00d647b081
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/soc/soc-jack.c
View file

@ -309,7 +309,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
/* GPIO descriptor */ /* GPIO descriptor */
gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev, gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev,
gpios[i].name, gpios[i].name,
gpios[i].idx); gpios[i].idx, GPIOD_IN);
if (IS_ERR(gpios[i].desc)) { if (IS_ERR(gpios[i].desc)) {
ret = PTR_ERR(gpios[i].desc); ret = PTR_ERR(gpios[i].desc);
dev_err(gpios[i].gpiod_dev, 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; 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) if (ret)
goto undo; goto undo;
gpios[i].desc = gpio_to_desc(gpios[i].gpio); 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); INIT_DELAYED_WORK(&gpios[i].work, gpio_work);
gpios[i].jack = jack; gpios[i].jack = jack;