diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-01-29 09:27:56 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:03:17 -0500 |
commit | 517400cbc75d0604bc34c1866dff7e55ca1be2b4 (patch) | |
tree | 43719d9a94cb0abb327bde3da78802b0ad8d8657 /sound/pci/ice1712 | |
parent | 32b47da03541f97e40f1af5488ef88250459f388 (diff) |
[ALSA] Add some more 'const', but needs changes in i2c/other/ak4*
Make data passed to ak4xxx_create 'const'.
Signed-of-by: Philipp Matthias Hahn <pmhahn@pmhahn.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/juli.c | 4 | ||||
-rw-r--r-- | sound/pci/ice1712/revo.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 4854eaf63a8a..d88172fa95da 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
@@ -146,7 +146,7 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice) | |||
146 | */ | 146 | */ |
147 | static int __devinit juli_init(struct snd_ice1712 *ice) | 147 | static int __devinit juli_init(struct snd_ice1712 *ice) |
148 | { | 148 | { |
149 | static unsigned char ak4114_init_vals[] = { | 149 | static const unsigned char ak4114_init_vals[] = { |
150 | /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, | 150 | /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, |
151 | /* AK4114_REQ_FORMAT */ AK4114_DIF_I24I2S, | 151 | /* AK4114_REQ_FORMAT */ AK4114_DIF_I24I2S, |
152 | /* AK4114_REG_IO0 */ AK4114_TX1E, | 152 | /* AK4114_REG_IO0 */ AK4114_TX1E, |
@@ -154,7 +154,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice) | |||
154 | /* AK4114_REG_INT0_MASK */ 0, | 154 | /* AK4114_REG_INT0_MASK */ 0, |
155 | /* AK4114_REG_INT1_MASK */ 0 | 155 | /* AK4114_REG_INT1_MASK */ 0 |
156 | }; | 156 | }; |
157 | static unsigned char ak4114_init_txcsb[] = { | 157 | static const unsigned char ak4114_init_txcsb[] = { |
158 | 0x41, 0x02, 0x2c, 0x00, 0x00 | 158 | 0x41, 0x02, 0x2c, 0x00, 0x00 |
159 | }; | 159 | }; |
160 | int err; | 160 | int err; |
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index 7d3bccbf0313..025a7e8497c3 100644 --- a/sound/pci/ice1712/revo.c +++ b/sound/pci/ice1712/revo.c | |||
@@ -185,18 +185,18 @@ static int revo51_i2c_init(struct snd_ice1712 *ice, | |||
185 | 185 | ||
186 | #define AK_DAC(xname,xch) { .name = xname, .num_channels = xch } | 186 | #define AK_DAC(xname,xch) { .name = xname, .num_channels = xch } |
187 | 187 | ||
188 | static struct snd_akm4xxx_dac_channel revo71_front[] = { | 188 | static const struct snd_akm4xxx_dac_channel revo71_front[] = { |
189 | AK_DAC("PCM Playback Volume", 2) | 189 | AK_DAC("PCM Playback Volume", 2) |
190 | }; | 190 | }; |
191 | 191 | ||
192 | static struct snd_akm4xxx_dac_channel revo71_surround[] = { | 192 | static const struct snd_akm4xxx_dac_channel revo71_surround[] = { |
193 | AK_DAC("PCM Center Playback Volume", 1), | 193 | AK_DAC("PCM Center Playback Volume", 1), |
194 | AK_DAC("PCM LFE Playback Volume", 1), | 194 | AK_DAC("PCM LFE Playback Volume", 1), |
195 | AK_DAC("PCM Side Playback Volume", 2), | 195 | AK_DAC("PCM Side Playback Volume", 2), |
196 | AK_DAC("PCM Rear Playback Volume", 2), | 196 | AK_DAC("PCM Rear Playback Volume", 2), |
197 | }; | 197 | }; |
198 | 198 | ||
199 | static struct snd_akm4xxx_dac_channel revo51_dac[] = { | 199 | static const struct snd_akm4xxx_dac_channel revo51_dac[] = { |
200 | AK_DAC("PCM Playback Volume", 2), | 200 | AK_DAC("PCM Playback Volume", 2), |
201 | AK_DAC("PCM Center Playback Volume", 1), | 201 | AK_DAC("PCM Center Playback Volume", 1), |
202 | AK_DAC("PCM LFE Playback Volume", 1), | 202 | AK_DAC("PCM LFE Playback Volume", 1), |
@@ -210,7 +210,7 @@ static const char *revo51_adc_input_names[] = { | |||
210 | NULL | 210 | NULL |
211 | }; | 211 | }; |
212 | 212 | ||
213 | static struct snd_akm4xxx_adc_channel revo51_adc[] = { | 213 | static const struct snd_akm4xxx_adc_channel revo51_adc[] = { |
214 | { | 214 | { |
215 | .name = "PCM Capture Volume", | 215 | .name = "PCM Capture Volume", |
216 | .switch_name = "PCM Capture Switch", | 216 | .switch_name = "PCM Capture Switch", |
@@ -219,7 +219,7 @@ static struct snd_akm4xxx_adc_channel revo51_adc[] = { | |||
219 | }, | 219 | }, |
220 | }; | 220 | }; |
221 | 221 | ||
222 | static struct snd_akm4xxx akm_revo_front __devinitdata = { | 222 | static const struct snd_akm4xxx akm_revo_front __devinitdata = { |
223 | .type = SND_AK4381, | 223 | .type = SND_AK4381, |
224 | .num_dacs = 2, | 224 | .num_dacs = 2, |
225 | .ops = { | 225 | .ops = { |
@@ -320,11 +320,11 @@ static void ap192_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate) | |||
320 | #endif | 320 | #endif |
321 | } | 321 | } |
322 | 322 | ||
323 | static struct snd_akm4xxx_dac_channel ap192_dac[] = { | 323 | static const struct snd_akm4xxx_dac_channel ap192_dac[] = { |
324 | AK_DAC("PCM Playback Volume", 2) | 324 | AK_DAC("PCM Playback Volume", 2) |
325 | }; | 325 | }; |
326 | 326 | ||
327 | static struct snd_akm4xxx akm_ap192 __devinitdata = { | 327 | static const struct snd_akm4xxx akm_ap192 __devinitdata = { |
328 | .type = SND_AK4358, | 328 | .type = SND_AK4358, |
329 | .num_dacs = 2, | 329 | .num_dacs = 2, |
330 | .ops = { | 330 | .ops = { |