3 files changed, 0 insertions, 106 deletions

diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 6b40ee60f4c5..e3005a674a24 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -1708,9 +1708,6 @@ struct snd_cs46xx {
 
         struct gameport *gameport;
 
-#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
-        int current_gpio;
-#endif
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
         struct mutex spos_mutex;
 
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 5ccb6c5feecb..1889929d1831 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -38,10 +38,6 @@
 #define CONFIG_SND_MAJOR        116
 #endif
 
-#ifndef CONFIG_SND_DEBUG
-#undef CONFIG_SND_DEBUG_MEMORY
-#endif
-
 #ifdef ALSA_BUILD
 #include "adriver.h"
 #endif
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 2c7bfc9fef61..8c44fefd15fc 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2084,71 +2084,6 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,
 #endif /* CONFIG_SND_CS46XX_NEW_DSP */
 
 
-#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
-static int snd_cs46xx_egpio_select_info(struct snd_kcontrol *kcontrol, 
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 8;
-        return 0;
-}
-
-static int snd_cs46xx_egpio_select_get(struct snd_kcontrol *kcontrol, 
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = chip->current_gpio;
-
-        return 0;
-}
-
-static int snd_cs46xx_egpio_select_put(struct snd_kcontrol *kcontrol, 
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
-        int change = (chip->current_gpio != ucontrol->value.integer.value[0]);
-        chip->current_gpio = ucontrol->value.integer.value[0];
-
-        return change;
-}
-
-
-static int snd_cs46xx_egpio_get(struct snd_kcontrol *kcontrol, 
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
-        int reg = kcontrol->private_value;
-
-        snd_printdd ("put: reg = %04x, gpio %02x\n",reg,chip->current_gpio);
-        ucontrol->value.integer.value[0] = 
-                (snd_cs46xx_peekBA0(chip, reg) & (1 << chip->current_gpio)) ? 1 : 0;
-  
-        return 0;
-}
-
-static int snd_cs46xx_egpio_put(struct snd_kcontrol *kcontrol, 
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);
-        int reg = kcontrol->private_value;
-        int val = snd_cs46xx_peekBA0(chip, reg);
-        int oldval = val;
-        snd_printdd ("put: reg = %04x, gpio %02x\n",reg,chip->current_gpio);
-
-        if (ucontrol->value.integer.value[0])
-                val |= (1 << chip->current_gpio);
-        else
-                val &= ~(1 << chip->current_gpio);
-
-        snd_cs46xx_pokeBA0(chip, reg,val);
-        snd_printdd ("put: val %08x oldval %08x\n",val,oldval);
-
-        return (oldval != val);
-}
-#endif /* CONFIG_SND_CS46XX_DEBUG_GPIO */
-
 static struct snd_kcontrol_new snd_cs46xx_controls[] __devinitdata = {
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -2241,40 +2176,6 @@ static struct snd_kcontrol_new snd_cs46xx_controls[] __devinitdata = {
 },
 
 #endif
-#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "EGPIO select",
-        .info = snd_cs46xx_egpio_select_info,
-        .get = snd_cs46xx_egpio_select_get,
-        .put = snd_cs46xx_egpio_select_put,
-        .private_value = 0,
-},
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "EGPIO Input/Output",
-        .info = snd_mixer_boolean_info,
-        .get = snd_cs46xx_egpio_get,
-        .put = snd_cs46xx_egpio_put,
-        .private_value = BA0_EGPIODR,
-},
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "EGPIO CMOS/Open drain",
-        .info = snd_mixer_boolean_info,
-        .get = snd_cs46xx_egpio_get,
-        .put = snd_cs46xx_egpio_put,
-        .private_value = BA0_EGPIOPTR,
-},
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "EGPIO On/Off",
-        .info = snd_mixer_boolean_info,
-        .get = snd_cs46xx_egpio_get,
-        .put = snd_cs46xx_egpio_put,
-        .private_value = BA0_EGPIOSR,
-},
-#endif
 };
 
 #ifdef CONFIG_SND_CS46XX_NEW_DSP