diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:26:10 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:26:10 -0400 |
commit | e7ced4137d859c576130ce7605e5fdd13221793d (patch) | |
tree | 94680d1f5ebbb29f52570cb5e7474f25bbaedf2c | |
parent | 7f471fd40742a5d87d887375430bf40331cbbcf6 (diff) |
ALSA: bebob: More constify text arrays
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/firewire/bebob/bebob.h | 4 | ||||
-rw-r--r-- | sound/firewire/bebob/bebob_focusrite.c | 10 | ||||
-rw-r--r-- | sound/firewire/bebob/bebob_maudio.c | 18 | ||||
-rw-r--r-- | sound/firewire/bebob/bebob_terratec.c | 4 | ||||
-rw-r--r-- | sound/firewire/bebob/bebob_yamaha.c | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h index e13eef99c27a..dfbcd233178c 100644 --- a/sound/firewire/bebob/bebob.h +++ b/sound/firewire/bebob/bebob.h | |||
@@ -52,7 +52,7 @@ extern const unsigned int snd_bebob_rate_table[SND_BEBOB_STRM_FMT_ENTRIES]; | |||
52 | #define SND_BEBOB_CLOCK_INTERNAL "Internal" | 52 | #define SND_BEBOB_CLOCK_INTERNAL "Internal" |
53 | struct snd_bebob_clock_spec { | 53 | struct snd_bebob_clock_spec { |
54 | unsigned int num; | 54 | unsigned int num; |
55 | char *const *labels; | 55 | const char *const *labels; |
56 | int (*get)(struct snd_bebob *bebob, unsigned int *id); | 56 | int (*get)(struct snd_bebob *bebob, unsigned int *id); |
57 | }; | 57 | }; |
58 | struct snd_bebob_rate_spec { | 58 | struct snd_bebob_rate_spec { |
@@ -61,7 +61,7 @@ struct snd_bebob_rate_spec { | |||
61 | }; | 61 | }; |
62 | struct snd_bebob_meter_spec { | 62 | struct snd_bebob_meter_spec { |
63 | unsigned int num; | 63 | unsigned int num; |
64 | char *const *labels; | 64 | const char *const *labels; |
65 | int (*get)(struct snd_bebob *bebob, u32 *target, unsigned int size); | 65 | int (*get)(struct snd_bebob *bebob, u32 *target, unsigned int size); |
66 | }; | 66 | }; |
67 | struct snd_bebob_spec { | 67 | struct snd_bebob_spec { |
diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c index 45a0eed6d5b1..a45a86952a41 100644 --- a/sound/firewire/bebob/bebob_focusrite.c +++ b/sound/firewire/bebob/bebob_focusrite.c | |||
@@ -101,11 +101,11 @@ saffire_write_quad(struct snd_bebob *bebob, u64 offset, u32 value) | |||
101 | &data, sizeof(__be32), 0); | 101 | &data, sizeof(__be32), 0); |
102 | } | 102 | } |
103 | 103 | ||
104 | static char *const saffirepro_26_clk_src_labels[] = { | 104 | static const char *const saffirepro_26_clk_src_labels[] = { |
105 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "ADAT1", "ADAT2", "Word Clock" | 105 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "ADAT1", "ADAT2", "Word Clock" |
106 | }; | 106 | }; |
107 | 107 | ||
108 | static char *const saffirepro_10_clk_src_labels[] = { | 108 | static const char *const saffirepro_10_clk_src_labels[] = { |
109 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "Word Clock" | 109 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "Word Clock" |
110 | }; | 110 | }; |
111 | static int | 111 | static int |
@@ -161,7 +161,7 @@ end: | |||
161 | } | 161 | } |
162 | 162 | ||
163 | struct snd_bebob_spec saffire_le_spec; | 163 | struct snd_bebob_spec saffire_le_spec; |
164 | static char *const saffire_both_clk_src_labels[] = { | 164 | static const char *const saffire_both_clk_src_labels[] = { |
165 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF" | 165 | SND_BEBOB_CLOCK_INTERNAL, "S/PDIF" |
166 | }; | 166 | }; |
167 | static int | 167 | static int |
@@ -176,12 +176,12 @@ saffire_both_clk_src_get(struct snd_bebob *bebob, unsigned int *id) | |||
176 | 176 | ||
177 | return err; | 177 | return err; |
178 | }; | 178 | }; |
179 | static char *const saffire_le_meter_labels[] = { | 179 | static const char *const saffire_le_meter_labels[] = { |
180 | ANA_IN, ANA_IN, DIG_IN, | 180 | ANA_IN, ANA_IN, DIG_IN, |
181 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, | 181 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, |
182 | STM_IN, STM_IN | 182 | STM_IN, STM_IN |
183 | }; | 183 | }; |
184 | static char *const saffire_meter_labels[] = { | 184 | static const char *const saffire_meter_labels[] = { |
185 | ANA_IN, ANA_IN, | 185 | ANA_IN, ANA_IN, |
186 | STM_IN, STM_IN, STM_IN, STM_IN, STM_IN, | 186 | STM_IN, STM_IN, STM_IN, STM_IN, STM_IN, |
187 | }; | 187 | }; |
diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c index 70faa3a32526..34cba8037b36 100644 --- a/sound/firewire/bebob/bebob_maudio.c +++ b/sound/firewire/bebob/bebob_maudio.c | |||
@@ -340,7 +340,7 @@ end: | |||
340 | } | 340 | } |
341 | 341 | ||
342 | /* Clock source control for special firmware */ | 342 | /* Clock source control for special firmware */ |
343 | static char *const special_clk_labels[] = { | 343 | static const char *const special_clk_labels[] = { |
344 | SND_BEBOB_CLOCK_INTERNAL " with Digital Mute", "Digital", | 344 | SND_BEBOB_CLOCK_INTERNAL " with Digital Mute", "Digital", |
345 | "Word Clock", SND_BEBOB_CLOCK_INTERNAL}; | 345 | "Word Clock", SND_BEBOB_CLOCK_INTERNAL}; |
346 | static int special_clk_get(struct snd_bebob *bebob, unsigned int *id) | 346 | static int special_clk_get(struct snd_bebob *bebob, unsigned int *id) |
@@ -438,7 +438,7 @@ static struct snd_kcontrol_new special_sync_ctl = { | |||
438 | }; | 438 | }; |
439 | 439 | ||
440 | /* Digital input interface control for special firmware */ | 440 | /* Digital input interface control for special firmware */ |
441 | static char *const special_dig_in_iface_labels[] = { | 441 | static const char *const special_dig_in_iface_labels[] = { |
442 | "S/PDIF Optical", "S/PDIF Coaxial", "ADAT Optical" | 442 | "S/PDIF Optical", "S/PDIF Coaxial", "ADAT Optical" |
443 | }; | 443 | }; |
444 | static int special_dig_in_iface_ctl_info(struct snd_kcontrol *kctl, | 444 | static int special_dig_in_iface_ctl_info(struct snd_kcontrol *kctl, |
@@ -539,7 +539,7 @@ static struct snd_kcontrol_new special_dig_in_iface_ctl = { | |||
539 | }; | 539 | }; |
540 | 540 | ||
541 | /* Digital output interface control for special firmware */ | 541 | /* Digital output interface control for special firmware */ |
542 | static char *const special_dig_out_iface_labels[] = { | 542 | static const char *const special_dig_out_iface_labels[] = { |
543 | "S/PDIF Optical and Coaxial", "ADAT Optical" | 543 | "S/PDIF Optical and Coaxial", "ADAT Optical" |
544 | }; | 544 | }; |
545 | static int special_dig_out_iface_ctl_info(struct snd_kcontrol *kctl, | 545 | static int special_dig_out_iface_ctl_info(struct snd_kcontrol *kctl, |
@@ -631,7 +631,7 @@ end: | |||
631 | } | 631 | } |
632 | 632 | ||
633 | /* Hardware metering for special firmware */ | 633 | /* Hardware metering for special firmware */ |
634 | static char *const special_meter_labels[] = { | 634 | static const char *const special_meter_labels[] = { |
635 | ANA_IN, ANA_IN, ANA_IN, ANA_IN, | 635 | ANA_IN, ANA_IN, ANA_IN, ANA_IN, |
636 | SPDIF_IN, | 636 | SPDIF_IN, |
637 | ADAT_IN, ADAT_IN, ADAT_IN, ADAT_IN, | 637 | ADAT_IN, ADAT_IN, ADAT_IN, ADAT_IN, |
@@ -671,30 +671,30 @@ end: | |||
671 | } | 671 | } |
672 | 672 | ||
673 | /* last 4 bytes are omitted because it's clock info. */ | 673 | /* last 4 bytes are omitted because it's clock info. */ |
674 | static char *const fw410_meter_labels[] = { | 674 | static const char *const fw410_meter_labels[] = { |
675 | ANA_IN, DIG_IN, | 675 | ANA_IN, DIG_IN, |
676 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, DIG_OUT, | 676 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, DIG_OUT, |
677 | HP_OUT | 677 | HP_OUT |
678 | }; | 678 | }; |
679 | static char *const audiophile_meter_labels[] = { | 679 | static const char *const audiophile_meter_labels[] = { |
680 | ANA_IN, DIG_IN, | 680 | ANA_IN, DIG_IN, |
681 | ANA_OUT, ANA_OUT, DIG_OUT, | 681 | ANA_OUT, ANA_OUT, DIG_OUT, |
682 | HP_OUT, AUX_OUT, | 682 | HP_OUT, AUX_OUT, |
683 | }; | 683 | }; |
684 | static char *const solo_meter_labels[] = { | 684 | static const char *const solo_meter_labels[] = { |
685 | ANA_IN, DIG_IN, | 685 | ANA_IN, DIG_IN, |
686 | STRM_IN, STRM_IN, | 686 | STRM_IN, STRM_IN, |
687 | ANA_OUT, DIG_OUT | 687 | ANA_OUT, DIG_OUT |
688 | }; | 688 | }; |
689 | 689 | ||
690 | /* no clock info */ | 690 | /* no clock info */ |
691 | static char *const ozonic_meter_labels[] = { | 691 | static const char *const ozonic_meter_labels[] = { |
692 | ANA_IN, ANA_IN, | 692 | ANA_IN, ANA_IN, |
693 | STRM_IN, STRM_IN, | 693 | STRM_IN, STRM_IN, |
694 | ANA_OUT, ANA_OUT | 694 | ANA_OUT, ANA_OUT |
695 | }; | 695 | }; |
696 | /* TODO: need testers. these positions are based on authour's assumption */ | 696 | /* TODO: need testers. these positions are based on authour's assumption */ |
697 | static char *const nrv10_meter_labels[] = { | 697 | static const char *const nrv10_meter_labels[] = { |
698 | ANA_IN, ANA_IN, ANA_IN, ANA_IN, | 698 | ANA_IN, ANA_IN, ANA_IN, ANA_IN, |
699 | DIG_IN, | 699 | DIG_IN, |
700 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, | 700 | ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, |
diff --git a/sound/firewire/bebob/bebob_terratec.c b/sound/firewire/bebob/bebob_terratec.c index 0e4c0bfc463b..83b677224f1f 100644 --- a/sound/firewire/bebob/bebob_terratec.c +++ b/sound/firewire/bebob/bebob_terratec.c | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #include "./bebob.h" | 9 | #include "./bebob.h" |
10 | 10 | ||
11 | static char *const phase88_rack_clk_src_labels[] = { | 11 | static const char *const phase88_rack_clk_src_labels[] = { |
12 | SND_BEBOB_CLOCK_INTERNAL, "Digital In", "Word Clock" | 12 | SND_BEBOB_CLOCK_INTERNAL, "Digital In", "Word Clock" |
13 | }; | 13 | }; |
14 | static int | 14 | static int |
@@ -29,7 +29,7 @@ end: | |||
29 | return err; | 29 | return err; |
30 | } | 30 | } |
31 | 31 | ||
32 | static char *const phase24_series_clk_src_labels[] = { | 32 | static const char *const phase24_series_clk_src_labels[] = { |
33 | SND_BEBOB_CLOCK_INTERNAL, "Digital In" | 33 | SND_BEBOB_CLOCK_INTERNAL, "Digital In" |
34 | }; | 34 | }; |
35 | static int | 35 | static int |
diff --git a/sound/firewire/bebob/bebob_yamaha.c b/sound/firewire/bebob/bebob_yamaha.c index 9b7e798180ff..ef1fe3823a9c 100644 --- a/sound/firewire/bebob/bebob_yamaha.c +++ b/sound/firewire/bebob/bebob_yamaha.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * reccomend users to close ffado-mixer at 192.0kHz if mixer is needless. | 28 | * reccomend users to close ffado-mixer at 192.0kHz if mixer is needless. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | static char *const clk_src_labels[] = {SND_BEBOB_CLOCK_INTERNAL, "SPDIF"}; | 31 | static const char *const clk_src_labels[] = {SND_BEBOB_CLOCK_INTERNAL, "SPDIF"}; |
32 | static int | 32 | static int |
33 | clk_src_get(struct snd_bebob *bebob, unsigned int *id) | 33 | clk_src_get(struct snd_bebob *bebob, unsigned int *id) |
34 | { | 34 | { |