aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 6c5ebd38c1b..ee4353f843e 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -341,10 +341,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
341 gpios[i].gpio, ret); 341 gpios[i].gpio, ret);
342 } 342 }
343 343
344#ifdef CONFIG_GPIO_SYSFS
345 /* Expose GPIO value over sysfs for diagnostic purposes */ 344 /* Expose GPIO value over sysfs for diagnostic purposes */
346 gpio_export(gpios[i].gpio, false); 345 gpio_export(gpios[i].gpio, false);
347#endif
348 346
349 /* Update initial jack status */ 347 /* Update initial jack status */
350 snd_soc_jack_gpio_detect(&gpios[i]); 348 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 int i; 374 int i;
377 375
378 for (i = 0; i < count; i++) { 376 for (i = 0; i < count; i++) {
379#ifdef CONFIG_GPIO_SYSFS
380 gpio_unexport(gpios[i].gpio); 377 gpio_unexport(gpios[i].gpio);
381#endif
382 free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]); 378 free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
383 cancel_delayed_work_sync(&gpios[i].work); 379 cancel_delayed_work_sync(&gpios[i].work);
384 gpio_free(gpios[i].gpio); 380 gpio_free(gpios[i].gpio);