Commit 82150101 authored by Mark Brown's avatar Mark Brown

ASoC: Remove ifdefs for GPIO_SYSFS

It is part of the GPIO API so should be stubbed appropriately.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3f7cec04
...@@ -341,10 +341,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, ...@@ -341,10 +341,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
gpios[i].gpio, ret); gpios[i].gpio, ret);
} }
#ifdef CONFIG_GPIO_SYSFS
/* Expose GPIO value over sysfs for diagnostic purposes */ /* Expose GPIO value over sysfs for diagnostic purposes */
gpio_export(gpios[i].gpio, false); gpio_export(gpios[i].gpio, false);
#endif
/* Update initial jack status */ /* Update initial jack status */
snd_soc_jack_gpio_detect(&gpios[i]); snd_soc_jack_gpio_detect(&gpios[i]);
...@@ -376,9 +374,7 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, ...@@ -376,9 +374,7 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
#ifdef CONFIG_GPIO_SYSFS
gpio_unexport(gpios[i].gpio); gpio_unexport(gpios[i].gpio);
#endif
free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]); free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
cancel_delayed_work_sync(&gpios[i].work); cancel_delayed_work_sync(&gpios[i].work);
gpio_free(gpios[i].gpio); gpio_free(gpios[i].gpio);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment