diff options
Diffstat (limited to 'sound/drivers/vx/vx_mixer.c')
-rw-r--r-- | sound/drivers/vx/vx_mixer.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c index be9477e30739..98a41ac40b60 100644 --- a/sound/drivers/vx/vx_mixer.c +++ b/sound/drivers/vx/vx_mixer.c | |||
@@ -455,7 +455,7 @@ static int vx_output_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | static struct snd_kcontrol_new vx_control_output_level = { | 458 | static const struct snd_kcontrol_new vx_control_output_level = { |
459 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 459 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
460 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | | 460 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | |
461 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), | 461 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), |
@@ -514,7 +514,7 @@ static int vx_audio_src_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
514 | return 0; | 514 | return 0; |
515 | } | 515 | } |
516 | 516 | ||
517 | static struct snd_kcontrol_new vx_control_audio_src = { | 517 | static const struct snd_kcontrol_new vx_control_audio_src = { |
518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
519 | .name = "Capture Source", | 519 | .name = "Capture Source", |
520 | .info = vx_audio_src_info, | 520 | .info = vx_audio_src_info, |
@@ -558,7 +558,7 @@ static int vx_clock_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ | |||
558 | return 0; | 558 | return 0; |
559 | } | 559 | } |
560 | 560 | ||
561 | static struct snd_kcontrol_new vx_control_clock_mode = { | 561 | static const struct snd_kcontrol_new vx_control_clock_mode = { |
562 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 562 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
563 | .name = "Clock Mode", | 563 | .name = "Clock Mode", |
564 | .info = vx_clock_mode_info, | 564 | .info = vx_clock_mode_info, |
@@ -717,7 +717,7 @@ static int vx_monitor_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ | |||
717 | 717 | ||
718 | static const DECLARE_TLV_DB_SCALE(db_scale_audio_gain, -10975, 25, 0); | 718 | static const DECLARE_TLV_DB_SCALE(db_scale_audio_gain, -10975, 25, 0); |
719 | 719 | ||
720 | static struct snd_kcontrol_new vx_control_audio_gain = { | 720 | static const struct snd_kcontrol_new vx_control_audio_gain = { |
721 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 721 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
722 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | | 722 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | |
723 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), | 723 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), |
@@ -727,14 +727,14 @@ static struct snd_kcontrol_new vx_control_audio_gain = { | |||
727 | .put = vx_audio_gain_put, | 727 | .put = vx_audio_gain_put, |
728 | .tlv = { .p = db_scale_audio_gain }, | 728 | .tlv = { .p = db_scale_audio_gain }, |
729 | }; | 729 | }; |
730 | static struct snd_kcontrol_new vx_control_output_switch = { | 730 | static const struct snd_kcontrol_new vx_control_output_switch = { |
731 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 731 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
732 | .name = "PCM Playback Switch", | 732 | .name = "PCM Playback Switch", |
733 | .info = vx_audio_sw_info, | 733 | .info = vx_audio_sw_info, |
734 | .get = vx_audio_sw_get, | 734 | .get = vx_audio_sw_get, |
735 | .put = vx_audio_sw_put | 735 | .put = vx_audio_sw_put |
736 | }; | 736 | }; |
737 | static struct snd_kcontrol_new vx_control_monitor_gain = { | 737 | static const struct snd_kcontrol_new vx_control_monitor_gain = { |
738 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 738 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
739 | .name = "Monitoring Volume", | 739 | .name = "Monitoring Volume", |
740 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | | 740 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | |
@@ -744,7 +744,7 @@ static struct snd_kcontrol_new vx_control_monitor_gain = { | |||
744 | .put = vx_audio_monitor_put, | 744 | .put = vx_audio_monitor_put, |
745 | .tlv = { .p = db_scale_audio_gain }, | 745 | .tlv = { .p = db_scale_audio_gain }, |
746 | }; | 746 | }; |
747 | static struct snd_kcontrol_new vx_control_monitor_switch = { | 747 | static const struct snd_kcontrol_new vx_control_monitor_switch = { |
748 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 748 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
749 | .name = "Monitoring Switch", | 749 | .name = "Monitoring Switch", |
750 | .info = vx_audio_sw_info, /* shared */ | 750 | .info = vx_audio_sw_info, /* shared */ |
@@ -805,7 +805,7 @@ static int vx_iec958_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu | |||
805 | return 0; | 805 | return 0; |
806 | } | 806 | } |
807 | 807 | ||
808 | static struct snd_kcontrol_new vx_control_iec958_mask = { | 808 | static const struct snd_kcontrol_new vx_control_iec958_mask = { |
809 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 809 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
810 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 810 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
811 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), | 811 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), |
@@ -813,7 +813,7 @@ static struct snd_kcontrol_new vx_control_iec958_mask = { | |||
813 | .get = vx_iec958_mask_get, | 813 | .get = vx_iec958_mask_get, |
814 | }; | 814 | }; |
815 | 815 | ||
816 | static struct snd_kcontrol_new vx_control_iec958 = { | 816 | static const struct snd_kcontrol_new vx_control_iec958 = { |
817 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 817 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
818 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 818 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), |
819 | .info = vx_iec958_info, | 819 | .info = vx_iec958_info, |
@@ -878,7 +878,7 @@ static int vx_saturation_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ | |||
878 | return 0; | 878 | return 0; |
879 | } | 879 | } |
880 | 880 | ||
881 | static struct snd_kcontrol_new vx_control_vu_meter = { | 881 | static const struct snd_kcontrol_new vx_control_vu_meter = { |
882 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 882 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
883 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, | 883 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
884 | /* name will be filled later */ | 884 | /* name will be filled later */ |
@@ -886,7 +886,7 @@ static struct snd_kcontrol_new vx_control_vu_meter = { | |||
886 | .get = vx_vu_meter_get, | 886 | .get = vx_vu_meter_get, |
887 | }; | 887 | }; |
888 | 888 | ||
889 | static struct snd_kcontrol_new vx_control_peak_meter = { | 889 | static const struct snd_kcontrol_new vx_control_peak_meter = { |
890 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 890 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
891 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, | 891 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
892 | /* name will be filled later */ | 892 | /* name will be filled later */ |
@@ -894,7 +894,7 @@ static struct snd_kcontrol_new vx_control_peak_meter = { | |||
894 | .get = vx_peak_meter_get, | 894 | .get = vx_peak_meter_get, |
895 | }; | 895 | }; |
896 | 896 | ||
897 | static struct snd_kcontrol_new vx_control_saturation = { | 897 | static const struct snd_kcontrol_new vx_control_saturation = { |
898 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 898 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
899 | .name = "Input Saturation", | 899 | .name = "Input Saturation", |
900 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, | 900 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |