diff options
-rw-r--r-- | sound/aoa/codecs/tas.c | 14 | ||||
-rw-r--r-- | sound/aoa/fabrics/layout.c | 8 | ||||
-rw-r--r-- | sound/core/ctljack.c | 2 | ||||
-rw-r--r-- | sound/drivers/vx/vx_mixer.c | 24 | ||||
-rw-r--r-- | sound/firewire/bebob/bebob_maudio.c | 8 | ||||
-rw-r--r-- | sound/mips/hal2.c | 4 | ||||
-rw-r--r-- | sound/mips/sgio2audio.c | 14 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxp_mixer.c | 4 | ||||
-rw-r--r-- | sound/ppc/awacs.c | 4 | ||||
-rw-r--r-- | sound/ppc/beep.c | 2 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 8 | ||||
-rw-r--r-- | sound/sh/aica.c | 4 | ||||
-rw-r--r-- | sound/soc/sh/siu_dai.c | 4 | ||||
-rw-r--r-- | sound/usb/mixer_quirks.c | 2 |
14 files changed, 51 insertions, 51 deletions
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c index 78ed1ffbf786..733b6365dad6 100644 --- a/sound/aoa/codecs/tas.c +++ b/sound/aoa/codecs/tas.c | |||
@@ -271,7 +271,7 @@ static int tas_snd_vol_put(struct snd_kcontrol *kcontrol, | |||
271 | return 1; | 271 | return 1; |
272 | } | 272 | } |
273 | 273 | ||
274 | static struct snd_kcontrol_new volume_control = { | 274 | static const struct snd_kcontrol_new volume_control = { |
275 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 275 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
276 | .name = "Master Playback Volume", | 276 | .name = "Master Playback Volume", |
277 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 277 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -314,7 +314,7 @@ static int tas_snd_mute_put(struct snd_kcontrol *kcontrol, | |||
314 | return 1; | 314 | return 1; |
315 | } | 315 | } |
316 | 316 | ||
317 | static struct snd_kcontrol_new mute_control = { | 317 | static const struct snd_kcontrol_new mute_control = { |
318 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 318 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
319 | .name = "Master Playback Switch", | 319 | .name = "Master Playback Switch", |
320 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 320 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -426,7 +426,7 @@ static int tas_snd_drc_range_put(struct snd_kcontrol *kcontrol, | |||
426 | return 1; | 426 | return 1; |
427 | } | 427 | } |
428 | 428 | ||
429 | static struct snd_kcontrol_new drc_range_control = { | 429 | static const struct snd_kcontrol_new drc_range_control = { |
430 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 430 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
431 | .name = "DRC Range", | 431 | .name = "DRC Range", |
432 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 432 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -466,7 +466,7 @@ static int tas_snd_drc_switch_put(struct snd_kcontrol *kcontrol, | |||
466 | return 1; | 466 | return 1; |
467 | } | 467 | } |
468 | 468 | ||
469 | static struct snd_kcontrol_new drc_switch_control = { | 469 | static const struct snd_kcontrol_new drc_switch_control = { |
470 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 470 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
471 | .name = "DRC Range Switch", | 471 | .name = "DRC Range Switch", |
472 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 472 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -524,7 +524,7 @@ static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol, | |||
524 | return 1; | 524 | return 1; |
525 | } | 525 | } |
526 | 526 | ||
527 | static struct snd_kcontrol_new capture_source_control = { | 527 | static const struct snd_kcontrol_new capture_source_control = { |
528 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 528 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
529 | /* If we name this 'Input Source', it properly shows up in | 529 | /* If we name this 'Input Source', it properly shows up in |
530 | * alsamixer as a selection, * but it's shown under the | 530 | * alsamixer as a selection, * but it's shown under the |
@@ -586,7 +586,7 @@ static int tas_snd_treble_put(struct snd_kcontrol *kcontrol, | |||
586 | return 1; | 586 | return 1; |
587 | } | 587 | } |
588 | 588 | ||
589 | static struct snd_kcontrol_new treble_control = { | 589 | static const struct snd_kcontrol_new treble_control = { |
590 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 590 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
591 | .name = "Treble", | 591 | .name = "Treble", |
592 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 592 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -637,7 +637,7 @@ static int tas_snd_bass_put(struct snd_kcontrol *kcontrol, | |||
637 | return 1; | 637 | return 1; |
638 | } | 638 | } |
639 | 639 | ||
640 | static struct snd_kcontrol_new bass_control = { | 640 | static const struct snd_kcontrol_new bass_control = { |
641 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 641 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
642 | .name = "Bass", | 642 | .name = "Bass", |
643 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 643 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index a0c4a5de809c..1eddf8fa188f 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c | |||
@@ -707,7 +707,7 @@ static int detect_choice_put(struct snd_kcontrol *kcontrol, | |||
707 | return 1; | 707 | return 1; |
708 | } | 708 | } |
709 | 709 | ||
710 | static struct snd_kcontrol_new headphone_detect_choice = { | 710 | static const struct snd_kcontrol_new headphone_detect_choice = { |
711 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 711 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
712 | .name = "Headphone Detect Autoswitch", | 712 | .name = "Headphone Detect Autoswitch", |
713 | .info = control_info, | 713 | .info = control_info, |
@@ -717,7 +717,7 @@ static struct snd_kcontrol_new headphone_detect_choice = { | |||
717 | .private_value = 0, | 717 | .private_value = 0, |
718 | }; | 718 | }; |
719 | 719 | ||
720 | static struct snd_kcontrol_new lineout_detect_choice = { | 720 | static const struct snd_kcontrol_new lineout_detect_choice = { |
721 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 721 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
722 | .name = "Line-Out Detect Autoswitch", | 722 | .name = "Line-Out Detect Autoswitch", |
723 | .info = control_info, | 723 | .info = control_info, |
@@ -749,7 +749,7 @@ static int detected_get(struct snd_kcontrol *kcontrol, | |||
749 | return 0; | 749 | return 0; |
750 | } | 750 | } |
751 | 751 | ||
752 | static struct snd_kcontrol_new headphone_detected = { | 752 | static const struct snd_kcontrol_new headphone_detected = { |
753 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 753 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
754 | .name = "Headphone Detected", | 754 | .name = "Headphone Detected", |
755 | .info = control_info, | 755 | .info = control_info, |
@@ -758,7 +758,7 @@ static struct snd_kcontrol_new headphone_detected = { | |||
758 | .private_value = 0, | 758 | .private_value = 0, |
759 | }; | 759 | }; |
760 | 760 | ||
761 | static struct snd_kcontrol_new lineout_detected = { | 761 | static const struct snd_kcontrol_new lineout_detected = { |
762 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 762 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
763 | .name = "Line-Out Detected", | 763 | .name = "Line-Out Detected", |
764 | .info = control_info, | 764 | .info = control_info, |
diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c index 84a3cd683068..0249d5e6ac23 100644 --- a/sound/core/ctljack.c +++ b/sound/core/ctljack.c | |||
@@ -23,7 +23,7 @@ static int jack_detect_kctl_get(struct snd_kcontrol *kcontrol, | |||
23 | return 0; | 23 | return 0; |
24 | } | 24 | } |
25 | 25 | ||
26 | static struct snd_kcontrol_new jack_detect_kctl = { | 26 | static const struct snd_kcontrol_new jack_detect_kctl = { |
27 | /* name is filled later */ | 27 | /* name is filled later */ |
28 | .iface = SNDRV_CTL_ELEM_IFACE_CARD, | 28 | .iface = SNDRV_CTL_ELEM_IFACE_CARD, |
29 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 29 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
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, |
diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c index 07e5abdbceb5..d10208f92edf 100644 --- a/sound/firewire/bebob/bebob_maudio.c +++ b/sound/firewire/bebob/bebob_maudio.c | |||
@@ -396,7 +396,7 @@ static int special_clk_ctl_put(struct snd_kcontrol *kctl, | |||
396 | 396 | ||
397 | return err; | 397 | return err; |
398 | } | 398 | } |
399 | static struct snd_kcontrol_new special_clk_ctl = { | 399 | static const struct snd_kcontrol_new special_clk_ctl = { |
400 | .name = "Clock Source", | 400 | .name = "Clock Source", |
401 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 401 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
402 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 402 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -429,7 +429,7 @@ static int special_sync_ctl_get(struct snd_kcontrol *kctl, | |||
429 | 429 | ||
430 | return 0; | 430 | return 0; |
431 | } | 431 | } |
432 | static struct snd_kcontrol_new special_sync_ctl = { | 432 | static const struct snd_kcontrol_new special_sync_ctl = { |
433 | .name = "Sync Status", | 433 | .name = "Sync Status", |
434 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 434 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
435 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | 435 | .access = SNDRV_CTL_ELEM_ACCESS_READ, |
@@ -521,7 +521,7 @@ end: | |||
521 | mutex_unlock(&bebob->mutex); | 521 | mutex_unlock(&bebob->mutex); |
522 | return err; | 522 | return err; |
523 | } | 523 | } |
524 | static struct snd_kcontrol_new special_dig_in_iface_ctl = { | 524 | static const struct snd_kcontrol_new special_dig_in_iface_ctl = { |
525 | .name = "Digital Input Interface", | 525 | .name = "Digital Input Interface", |
526 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 526 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
527 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 527 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -577,7 +577,7 @@ static int special_dig_out_iface_ctl_set(struct snd_kcontrol *kctl, | |||
577 | mutex_unlock(&bebob->mutex); | 577 | mutex_unlock(&bebob->mutex); |
578 | return err; | 578 | return err; |
579 | } | 579 | } |
580 | static struct snd_kcontrol_new special_dig_out_iface_ctl = { | 580 | static const struct snd_kcontrol_new special_dig_out_iface_ctl = { |
581 | .name = "Digital Output Interface", | 581 | .name = "Digital Output Interface", |
582 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 582 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
583 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 583 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 684dc4ddef41..6505deb8c06b 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
@@ -264,7 +264,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, | |||
264 | return old != new; | 264 | return old != new; |
265 | } | 265 | } |
266 | 266 | ||
267 | static struct snd_kcontrol_new hal2_ctrl_headphone = { | 267 | static const struct snd_kcontrol_new hal2_ctrl_headphone = { |
268 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 268 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
269 | .name = "Headphone Playback Volume", | 269 | .name = "Headphone Playback Volume", |
270 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 270 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -274,7 +274,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone = { | |||
274 | .put = hal2_gain_put, | 274 | .put = hal2_gain_put, |
275 | }; | 275 | }; |
276 | 276 | ||
277 | static struct snd_kcontrol_new hal2_ctrl_mic = { | 277 | static const struct snd_kcontrol_new hal2_ctrl_mic = { |
278 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 278 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
279 | .name = "Mic Capture Volume", | 279 | .name = "Mic Capture Volume", |
280 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 280 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index f07aa3993f83..0ebc1c3727df 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c | |||
@@ -230,7 +230,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol, | |||
230 | } | 230 | } |
231 | 231 | ||
232 | /* dac1/pcm0 mixer control */ | 232 | /* dac1/pcm0 mixer control */ |
233 | static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = { | 233 | static const struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = { |
234 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 234 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
235 | .name = "PCM Playback Volume", | 235 | .name = "PCM Playback Volume", |
236 | .index = 0, | 236 | .index = 0, |
@@ -242,7 +242,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = { | |||
242 | }; | 242 | }; |
243 | 243 | ||
244 | /* dac2/pcm1 mixer control */ | 244 | /* dac2/pcm1 mixer control */ |
245 | static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = { | 245 | static const struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = { |
246 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 246 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
247 | .name = "PCM Playback Volume", | 247 | .name = "PCM Playback Volume", |
248 | .index = 1, | 248 | .index = 1, |
@@ -254,7 +254,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = { | |||
254 | }; | 254 | }; |
255 | 255 | ||
256 | /* record level mixer control */ | 256 | /* record level mixer control */ |
257 | static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = { | 257 | static const struct snd_kcontrol_new sgio2audio_ctrl_reclevel = { |
258 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 258 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
259 | .name = "Capture Volume", | 259 | .name = "Capture Volume", |
260 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 260 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -265,7 +265,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = { | |||
265 | }; | 265 | }; |
266 | 266 | ||
267 | /* record level source control */ | 267 | /* record level source control */ |
268 | static struct snd_kcontrol_new sgio2audio_ctrl_recsource = { | 268 | static const struct snd_kcontrol_new sgio2audio_ctrl_recsource = { |
269 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 269 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
270 | .name = "Capture Source", | 270 | .name = "Capture Source", |
271 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 271 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -275,7 +275,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource = { | |||
275 | }; | 275 | }; |
276 | 276 | ||
277 | /* line mixer control */ | 277 | /* line mixer control */ |
278 | static struct snd_kcontrol_new sgio2audio_ctrl_line = { | 278 | static const struct snd_kcontrol_new sgio2audio_ctrl_line = { |
279 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 279 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
280 | .name = "Line Playback Volume", | 280 | .name = "Line Playback Volume", |
281 | .index = 0, | 281 | .index = 0, |
@@ -287,7 +287,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line = { | |||
287 | }; | 287 | }; |
288 | 288 | ||
289 | /* cd mixer control */ | 289 | /* cd mixer control */ |
290 | static struct snd_kcontrol_new sgio2audio_ctrl_cd = { | 290 | static const struct snd_kcontrol_new sgio2audio_ctrl_cd = { |
291 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 291 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
292 | .name = "Line Playback Volume", | 292 | .name = "Line Playback Volume", |
293 | .index = 1, | 293 | .index = 1, |
@@ -299,7 +299,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd = { | |||
299 | }; | 299 | }; |
300 | 300 | ||
301 | /* mic mixer control */ | 301 | /* mic mixer control */ |
302 | static struct snd_kcontrol_new sgio2audio_ctrl_mic = { | 302 | static const struct snd_kcontrol_new sgio2audio_ctrl_mic = { |
303 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 303 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
304 | .name = "Mic Playback Volume", | 304 | .name = "Mic Playback Volume", |
305 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 305 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c index 1ca3eef9e305..304b153005a5 100644 --- a/sound/pcmcia/vx/vxp_mixer.c +++ b/sound/pcmcia/vx/vxp_mixer.c | |||
@@ -69,7 +69,7 @@ static int vx_mic_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
69 | 69 | ||
70 | static const DECLARE_TLV_DB_SCALE(db_scale_mic, -21, 3, 0); | 70 | static const DECLARE_TLV_DB_SCALE(db_scale_mic, -21, 3, 0); |
71 | 71 | ||
72 | static struct snd_kcontrol_new vx_control_mic_level = { | 72 | static const struct snd_kcontrol_new vx_control_mic_level = { |
73 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 73 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
74 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | | 74 | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | |
75 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), | 75 | SNDRV_CTL_ELEM_ACCESS_TLV_READ), |
@@ -109,7 +109,7 @@ static int vx_mic_boost_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v | |||
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
112 | static struct snd_kcontrol_new vx_control_mic_boost = { | 112 | static const struct snd_kcontrol_new vx_control_mic_boost = { |
113 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 113 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
114 | .name = "Mic Boost", | 114 | .name = "Mic Boost", |
115 | .info = vx_mic_boost_info, | 115 | .info = vx_mic_boost_info, |
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index 1468e4b7bf93..d1e4ef1c5c30 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c | |||
@@ -514,7 +514,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] = { | |||
514 | }, | 514 | }, |
515 | }; | 515 | }; |
516 | 516 | ||
517 | static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw = { | 517 | static const struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw = { |
518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
519 | .name = "Headphone Playback Switch", | 519 | .name = "Headphone Playback Switch", |
520 | .info = snd_pmac_boolean_stereo_info, | 520 | .info = snd_pmac_boolean_stereo_info, |
@@ -523,7 +523,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw = { | |||
523 | .private_value = AMP_CH_HD, | 523 | .private_value = AMP_CH_HD, |
524 | }; | 524 | }; |
525 | 525 | ||
526 | static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw = { | 526 | static const struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw = { |
527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
528 | .name = "Speaker Playback Switch", | 528 | .name = "Speaker Playback Switch", |
529 | .info = snd_pmac_boolean_stereo_info, | 529 | .info = snd_pmac_boolean_stereo_info, |
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index d3524f9fa05d..f19eb3e39937 100644 --- a/sound/ppc/beep.c +++ b/sound/ppc/beep.c | |||
@@ -206,7 +206,7 @@ static int snd_pmac_put_beep(struct snd_kcontrol *kcontrol, | |||
206 | return oval != chip->beep->volume; | 206 | return oval != chip->beep->volume; |
207 | } | 207 | } |
208 | 208 | ||
209 | static struct snd_kcontrol_new snd_pmac_beep_mixer = { | 209 | static const struct snd_kcontrol_new snd_pmac_beep_mixer = { |
210 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 210 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
211 | .name = "Beep Playback Volume", | 211 | .name = "Beep Playback Volume", |
212 | .info = snd_pmac_info_beep, | 212 | .info = snd_pmac_info_beep, |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 58ee8089bbf9..0779a2912237 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -897,7 +897,7 @@ static struct snd_kcontrol_new snapper_mixers[] = { | |||
897 | }, | 897 | }, |
898 | }; | 898 | }; |
899 | 899 | ||
900 | static struct snd_kcontrol_new tumbler_hp_sw = { | 900 | static const struct snd_kcontrol_new tumbler_hp_sw = { |
901 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 901 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
902 | .name = "Headphone Playback Switch", | 902 | .name = "Headphone Playback Switch", |
903 | .info = snd_pmac_boolean_mono_info, | 903 | .info = snd_pmac_boolean_mono_info, |
@@ -905,7 +905,7 @@ static struct snd_kcontrol_new tumbler_hp_sw = { | |||
905 | .put = tumbler_put_mute_switch, | 905 | .put = tumbler_put_mute_switch, |
906 | .private_value = TUMBLER_MUTE_HP, | 906 | .private_value = TUMBLER_MUTE_HP, |
907 | }; | 907 | }; |
908 | static struct snd_kcontrol_new tumbler_speaker_sw = { | 908 | static const struct snd_kcontrol_new tumbler_speaker_sw = { |
909 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 909 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
910 | .name = "Speaker Playback Switch", | 910 | .name = "Speaker Playback Switch", |
911 | .info = snd_pmac_boolean_mono_info, | 911 | .info = snd_pmac_boolean_mono_info, |
@@ -913,7 +913,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw = { | |||
913 | .put = tumbler_put_mute_switch, | 913 | .put = tumbler_put_mute_switch, |
914 | .private_value = TUMBLER_MUTE_AMP, | 914 | .private_value = TUMBLER_MUTE_AMP, |
915 | }; | 915 | }; |
916 | static struct snd_kcontrol_new tumbler_lineout_sw = { | 916 | static const struct snd_kcontrol_new tumbler_lineout_sw = { |
917 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 917 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
918 | .name = "Line Out Playback Switch", | 918 | .name = "Line Out Playback Switch", |
919 | .info = snd_pmac_boolean_mono_info, | 919 | .info = snd_pmac_boolean_mono_info, |
@@ -921,7 +921,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw = { | |||
921 | .put = tumbler_put_mute_switch, | 921 | .put = tumbler_put_mute_switch, |
922 | .private_value = TUMBLER_MUTE_LINE, | 922 | .private_value = TUMBLER_MUTE_LINE, |
923 | }; | 923 | }; |
924 | static struct snd_kcontrol_new tumbler_drc_sw = { | 924 | static const struct snd_kcontrol_new tumbler_drc_sw = { |
925 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 925 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
926 | .name = "DRC Switch", | 926 | .name = "DRC Switch", |
927 | .info = snd_pmac_boolean_mono_info, | 927 | .info = snd_pmac_boolean_mono_info, |
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index fbbc25279559..ab4802df62e1 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c | |||
@@ -535,7 +535,7 @@ static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol, | |||
535 | return 1; | 535 | return 1; |
536 | } | 536 | } |
537 | 537 | ||
538 | static struct snd_kcontrol_new snd_aica_pcmswitch_control = { | 538 | static const struct snd_kcontrol_new snd_aica_pcmswitch_control = { |
539 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 539 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
540 | .name = "PCM Playback Switch", | 540 | .name = "PCM Playback Switch", |
541 | .index = 0, | 541 | .index = 0, |
@@ -544,7 +544,7 @@ static struct snd_kcontrol_new snd_aica_pcmswitch_control = { | |||
544 | .put = aica_pcmswitch_put | 544 | .put = aica_pcmswitch_put |
545 | }; | 545 | }; |
546 | 546 | ||
547 | static struct snd_kcontrol_new snd_aica_pcmvolume_control = { | 547 | static const struct snd_kcontrol_new snd_aica_pcmvolume_control = { |
548 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 548 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
549 | .name = "PCM Playback Volume", | 549 | .name = "PCM Playback Volume", |
550 | .index = 0, | 550 | .index = 0, |
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 76b2ab8c2b4a..4a22aadac294 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c | |||
@@ -441,7 +441,7 @@ static int siu_dai_put_volume(struct snd_kcontrol *kctrl, | |||
441 | return 0; | 441 | return 0; |
442 | } | 442 | } |
443 | 443 | ||
444 | static struct snd_kcontrol_new playback_controls = { | 444 | static const struct snd_kcontrol_new playback_controls = { |
445 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 445 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
446 | .name = "PCM Playback Volume", | 446 | .name = "PCM Playback Volume", |
447 | .index = 0, | 447 | .index = 0, |
@@ -451,7 +451,7 @@ static struct snd_kcontrol_new playback_controls = { | |||
451 | .private_value = VOLUME_PLAYBACK, | 451 | .private_value = VOLUME_PLAYBACK, |
452 | }; | 452 | }; |
453 | 453 | ||
454 | static struct snd_kcontrol_new capture_controls = { | 454 | static const struct snd_kcontrol_new capture_controls = { |
455 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 455 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
456 | .name = "PCM Capture Volume", | 456 | .name = "PCM Capture Volume", |
457 | .index = 0, | 457 | .index = 0, |
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 4fa0053a40af..e3d1dec48ee4 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c | |||
@@ -362,7 +362,7 @@ static int snd_audigy2nx_led_resume(struct usb_mixer_elem_list *list) | |||
362 | } | 362 | } |
363 | 363 | ||
364 | /* name and private_value are set dynamically */ | 364 | /* name and private_value are set dynamically */ |
365 | static struct snd_kcontrol_new snd_audigy2nx_control = { | 365 | static const struct snd_kcontrol_new snd_audigy2nx_control = { |
366 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 366 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
367 | .info = snd_audigy2nx_led_info, | 367 | .info = snd_audigy2nx_led_info, |
368 | .get = snd_audigy2nx_led_get, | 368 | .get = snd_audigy2nx_led_get, |