diff options
Diffstat (limited to 'sound/pci/au88x0/au88x0_eq.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_eq.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c index 9d933cc0ea0b..13bc8ed301c5 100644 --- a/sound/pci/au88x0/au88x0_eq.c +++ b/sound/pci/au88x0/au88x0_eq.c | |||
@@ -730,7 +730,7 @@ static void vortex_Eqlzr_shutdown(vortex_t * vortex) | |||
730 | 730 | ||
731 | /* Control interface */ | 731 | /* Control interface */ |
732 | static int | 732 | static int |
733 | snd_vortex_eqtoggle_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 733 | snd_vortex_eqtoggle_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
734 | { | 734 | { |
735 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 735 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
736 | uinfo->count = 1; | 736 | uinfo->count = 1; |
@@ -740,8 +740,8 @@ snd_vortex_eqtoggle_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
740 | } | 740 | } |
741 | 741 | ||
742 | static int | 742 | static int |
743 | snd_vortex_eqtoggle_get(snd_kcontrol_t * kcontrol, | 743 | snd_vortex_eqtoggle_get(struct snd_kcontrol *kcontrol, |
744 | snd_ctl_elem_value_t * ucontrol) | 744 | struct snd_ctl_elem_value *ucontrol) |
745 | { | 745 | { |
746 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); | 746 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); |
747 | eqlzr_t *eq = &(vortex->eq); | 747 | eqlzr_t *eq = &(vortex->eq); |
@@ -753,8 +753,8 @@ snd_vortex_eqtoggle_get(snd_kcontrol_t * kcontrol, | |||
753 | } | 753 | } |
754 | 754 | ||
755 | static int | 755 | static int |
756 | snd_vortex_eqtoggle_put(snd_kcontrol_t * kcontrol, | 756 | snd_vortex_eqtoggle_put(struct snd_kcontrol *kcontrol, |
757 | snd_ctl_elem_value_t * ucontrol) | 757 | struct snd_ctl_elem_value *ucontrol) |
758 | { | 758 | { |
759 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); | 759 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); |
760 | eqlzr_t *eq = &(vortex->eq); | 760 | eqlzr_t *eq = &(vortex->eq); |
@@ -766,7 +766,7 @@ snd_vortex_eqtoggle_put(snd_kcontrol_t * kcontrol, | |||
766 | return 1; /* Allways changes */ | 766 | return 1; /* Allways changes */ |
767 | } | 767 | } |
768 | 768 | ||
769 | static snd_kcontrol_new_t vortex_eqtoggle_kcontrol __devinitdata = { | 769 | static struct snd_kcontrol_new vortex_eqtoggle_kcontrol __devinitdata = { |
770 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 770 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
771 | .name = "EQ Enable", | 771 | .name = "EQ Enable", |
772 | .index = 0, | 772 | .index = 0, |
@@ -778,7 +778,7 @@ static snd_kcontrol_new_t vortex_eqtoggle_kcontrol __devinitdata = { | |||
778 | }; | 778 | }; |
779 | 779 | ||
780 | static int | 780 | static int |
781 | snd_vortex_eq_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 781 | snd_vortex_eq_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
782 | { | 782 | { |
783 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 783 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
784 | uinfo->count = 2; | 784 | uinfo->count = 2; |
@@ -788,7 +788,7 @@ snd_vortex_eq_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
788 | } | 788 | } |
789 | 789 | ||
790 | static int | 790 | static int |
791 | snd_vortex_eq_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | 791 | snd_vortex_eq_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
792 | { | 792 | { |
793 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); | 793 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); |
794 | int i = kcontrol->private_value; | 794 | int i = kcontrol->private_value; |
@@ -802,7 +802,7 @@ snd_vortex_eq_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
802 | } | 802 | } |
803 | 803 | ||
804 | static int | 804 | static int |
805 | snd_vortex_eq_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | 805 | snd_vortex_eq_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
806 | { | 806 | { |
807 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); | 807 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); |
808 | int changed = 0, i = kcontrol->private_value; | 808 | int changed = 0, i = kcontrol->private_value; |
@@ -824,7 +824,7 @@ snd_vortex_eq_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
824 | return changed; | 824 | return changed; |
825 | } | 825 | } |
826 | 826 | ||
827 | static snd_kcontrol_new_t vortex_eq_kcontrol __devinitdata = { | 827 | static struct snd_kcontrol_new vortex_eq_kcontrol __devinitdata = { |
828 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 828 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
829 | .name = " .", | 829 | .name = " .", |
830 | .index = 0, | 830 | .index = 0, |
@@ -836,7 +836,7 @@ static snd_kcontrol_new_t vortex_eq_kcontrol __devinitdata = { | |||
836 | }; | 836 | }; |
837 | 837 | ||
838 | static int | 838 | static int |
839 | snd_vortex_peaks_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 839 | snd_vortex_peaks_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
840 | { | 840 | { |
841 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 841 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
842 | uinfo->count = 20; | 842 | uinfo->count = 20; |
@@ -846,7 +846,7 @@ snd_vortex_peaks_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
846 | } | 846 | } |
847 | 847 | ||
848 | static int | 848 | static int |
849 | snd_vortex_peaks_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | 849 | snd_vortex_peaks_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
850 | { | 850 | { |
851 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); | 851 | vortex_t *vortex = snd_kcontrol_chip(kcontrol); |
852 | int i, count; | 852 | int i, count; |
@@ -863,7 +863,7 @@ snd_vortex_peaks_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
863 | return 0; | 863 | return 0; |
864 | } | 864 | } |
865 | 865 | ||
866 | static snd_kcontrol_new_t vortex_levels_kcontrol __devinitdata = { | 866 | static struct snd_kcontrol_new vortex_levels_kcontrol __devinitdata = { |
867 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 867 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
868 | .name = "EQ Peaks", | 868 | .name = "EQ Peaks", |
869 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, | 869 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
@@ -888,7 +888,7 @@ static char *EqBandLabels[10] __devinitdata = { | |||
888 | /* ALSA driver entry points. Init and exit. */ | 888 | /* ALSA driver entry points. Init and exit. */ |
889 | static int vortex_eq_init(vortex_t * vortex) | 889 | static int vortex_eq_init(vortex_t * vortex) |
890 | { | 890 | { |
891 | snd_kcontrol_t *kcontrol; | 891 | struct snd_kcontrol *kcontrol; |
892 | int err, i; | 892 | int err, i; |
893 | 893 | ||
894 | vortex_Eqlzr_init(vortex); | 894 | vortex_Eqlzr_init(vortex); |