aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r--sound/pci/ice1712/ice1712.c2
-rw-r--r--sound/pci/ice1712/ice1712.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index cd41c7eb6c6b..caa0886d460e 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -1745,8 +1745,6 @@ static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =
1745 .put = snd_ice1712_spdif_stream_put 1745 .put = snd_ice1712_spdif_stream_put
1746}; 1746};
1747 1747
1748#define snd_ice1712_gpio_info snd_ctl_boolean_mono_info
1749
1750int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol, 1748int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol,
1751 struct snd_ctl_elem_value *ucontrol) 1749 struct snd_ctl_elem_value *ucontrol)
1752{ 1750{
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 6ac486d9c138..d072f7b98b29 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -451,11 +451,10 @@ static inline void snd_ice1712_restore_gpio_status(struct snd_ice1712 *ice)
451 451
452/* for bit controls */ 452/* for bit controls */
453#define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \ 453#define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \
454{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ice1712_gpio_info, \ 454{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ctl_boolean_mono_info, \
455 .get = snd_ice1712_gpio_get, .put = snd_ice1712_gpio_put, \ 455 .get = snd_ice1712_gpio_get, .put = snd_ice1712_gpio_put, \
456 .private_value = mask | (invert << 24) } 456 .private_value = mask | (invert << 24) }
457 457
458int snd_ice1712_gpio_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
459int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); 458int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
460int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); 459int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
461 460