]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Remove ifdefs for GPIO_SYSFS
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 23:59:41 +0000 (23:59 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 21 Dec 2011 00:12:28 +0000 (00:12 +0000)
It is part of the GPIO API so should be stubbed appropriately.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-jack.c

index 6c5ebd38c1b0f050f515dbb2dc1c47acaafc1ba4..ee4353f843eae07a82b7358004d9defb63ae5e96 100644 (file)
@@ -341,10 +341,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                                        gpios[i].gpio, ret);
                }
 
-#ifdef CONFIG_GPIO_SYSFS
                /* Expose GPIO value over sysfs for diagnostic purposes */
                gpio_export(gpios[i].gpio, false);
-#endif
 
                /* Update initial jack status */
                snd_soc_jack_gpio_detect(&gpios[i]);
@@ -376,9 +374,7 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
        int i;
 
        for (i = 0; i < count; i++) {
-#ifdef CONFIG_GPIO_SYSFS
                gpio_unexport(gpios[i].gpio);
-#endif
                free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
                cancel_delayed_work_sync(&gpios[i].work);
                gpio_free(gpios[i].gpio);