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/i2c | |
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/i2c')
-rw-r--r-- | sound/i2c/other/ak4114.c | 2 | ||||
-rw-r--r-- | sound/i2c/other/ak4117.c | 2 | ||||
-rw-r--r-- | sound/i2c/other/ak4xxx-adda.c | 15 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index 69dcaf8ac793..34bbafc81cf6 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c | |||
@@ -79,7 +79,7 @@ static int snd_ak4114_dev_free(struct snd_device *device) | |||
79 | 79 | ||
80 | int snd_ak4114_create(struct snd_card *card, | 80 | int snd_ak4114_create(struct snd_card *card, |
81 | ak4114_read_t *read, ak4114_write_t *write, | 81 | ak4114_read_t *read, ak4114_write_t *write, |
82 | unsigned char pgm[7], unsigned char txcsb[5], | 82 | const unsigned char pgm[7], const unsigned char txcsb[5], |
83 | void *private_data, struct ak4114 **r_ak4114) | 83 | void *private_data, struct ak4114 **r_ak4114) |
84 | { | 84 | { |
85 | struct ak4114 *chip; | 85 | struct ak4114 *chip; |
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 4e45952dd95a..c022f29da2f7 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c | |||
@@ -74,7 +74,7 @@ static int snd_ak4117_dev_free(struct snd_device *device) | |||
74 | } | 74 | } |
75 | 75 | ||
76 | int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t *write, | 76 | int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t *write, |
77 | unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117) | 77 | const unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117) |
78 | { | 78 | { |
79 | struct ak4117 *chip; | 79 | struct ak4117 *chip; |
80 | int err = 0; | 80 | int err = 0; |
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index fe61b92f4e47..3d9d6c5d354e 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c | |||
@@ -140,7 +140,7 @@ EXPORT_SYMBOL(snd_akm4xxx_reset); | |||
140 | * Used for AK4524 input/ouput attenuation, AK4528, and | 140 | * Used for AK4524 input/ouput attenuation, AK4528, and |
141 | * AK5365 input attenuation | 141 | * AK5365 input attenuation |
142 | */ | 142 | */ |
143 | static unsigned char vol_cvt_datt[128] = { | 143 | static const unsigned char vol_cvt_datt[128] = { |
144 | 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, | 144 | 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, |
145 | 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x06, | 145 | 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x06, |
146 | 0x06, 0x07, 0x07, 0x08, 0x08, 0x08, 0x09, 0x0a, | 146 | 0x06, 0x07, 0x07, 0x08, 0x08, 0x08, 0x09, 0x0a, |
@@ -184,7 +184,7 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
184 | 0x07, 0x00, /* 7: DAC right muted */ | 184 | 0x07, 0x00, /* 7: DAC right muted */ |
185 | 0xff, 0xff | 185 | 0xff, 0xff |
186 | }; | 186 | }; |
187 | static unsigned char inits_ak4528[] = { | 187 | static const unsigned char inits_ak4528[] = { |
188 | 0x00, 0x07, /* 0: all power up */ | 188 | 0x00, 0x07, /* 0: all power up */ |
189 | 0x01, 0x00, /* 1: ADC/DAC reset */ | 189 | 0x01, 0x00, /* 1: ADC/DAC reset */ |
190 | 0x02, 0x60, /* 2: 24bit I2S */ | 190 | 0x02, 0x60, /* 2: 24bit I2S */ |
@@ -194,7 +194,7 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
194 | 0x05, 0x00, /* 5: ADC right muted */ | 194 | 0x05, 0x00, /* 5: ADC right muted */ |
195 | 0xff, 0xff | 195 | 0xff, 0xff |
196 | }; | 196 | }; |
197 | static unsigned char inits_ak4529[] = { | 197 | static const unsigned char inits_ak4529[] = { |
198 | 0x09, 0x01, /* 9: ATS=0, RSTN=1 */ | 198 | 0x09, 0x01, /* 9: ATS=0, RSTN=1 */ |
199 | 0x0a, 0x3f, /* A: all power up, no zero/overflow detection */ | 199 | 0x0a, 0x3f, /* A: all power up, no zero/overflow detection */ |
200 | 0x00, 0x0c, /* 0: TDM=0, 24bit I2S, SMUTE=0 */ | 200 | 0x00, 0x0c, /* 0: TDM=0, 24bit I2S, SMUTE=0 */ |
@@ -210,7 +210,7 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
210 | 0x08, 0x55, /* 8: deemphasis all off */ | 210 | 0x08, 0x55, /* 8: deemphasis all off */ |
211 | 0xff, 0xff | 211 | 0xff, 0xff |
212 | }; | 212 | }; |
213 | static unsigned char inits_ak4355[] = { | 213 | static const unsigned char inits_ak4355[] = { |
214 | 0x01, 0x02, /* 1: reset and soft-mute */ | 214 | 0x01, 0x02, /* 1: reset and soft-mute */ |
215 | 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, | 215 | 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, |
216 | * disable DZF, sharp roll-off, RSTN#=0 */ | 216 | * disable DZF, sharp roll-off, RSTN#=0 */ |
@@ -227,7 +227,7 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
227 | 0x01, 0x01, /* 1: un-reset, unmute */ | 227 | 0x01, 0x01, /* 1: un-reset, unmute */ |
228 | 0xff, 0xff | 228 | 0xff, 0xff |
229 | }; | 229 | }; |
230 | static unsigned char inits_ak4358[] = { | 230 | static const unsigned char inits_ak4358[] = { |
231 | 0x01, 0x02, /* 1: reset and soft-mute */ | 231 | 0x01, 0x02, /* 1: reset and soft-mute */ |
232 | 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, | 232 | 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, |
233 | * disable DZF, sharp roll-off, RSTN#=0 */ | 233 | * disable DZF, sharp roll-off, RSTN#=0 */ |
@@ -246,7 +246,7 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
246 | 0x01, 0x01, /* 1: un-reset, unmute */ | 246 | 0x01, 0x01, /* 1: un-reset, unmute */ |
247 | 0xff, 0xff | 247 | 0xff, 0xff |
248 | }; | 248 | }; |
249 | static unsigned char inits_ak4381[] = { | 249 | static const unsigned char inits_ak4381[] = { |
250 | 0x00, 0x0c, /* 0: mode3(i2s), disable auto-clock detect */ | 250 | 0x00, 0x0c, /* 0: mode3(i2s), disable auto-clock detect */ |
251 | 0x01, 0x02, /* 1: de-emphasis off, normal speed, | 251 | 0x01, 0x02, /* 1: de-emphasis off, normal speed, |
252 | * sharp roll-off, DZF off */ | 252 | * sharp roll-off, DZF off */ |
@@ -259,7 +259,8 @@ void snd_akm4xxx_init(struct snd_akm4xxx *ak) | |||
259 | }; | 259 | }; |
260 | 260 | ||
261 | int chip, num_chips; | 261 | int chip, num_chips; |
262 | unsigned char *ptr, reg, data, *inits; | 262 | const unsigned char *ptr, *inits; |
263 | unsigned char reg, data; | ||
263 | 264 | ||
264 | memset(ak->images, 0, sizeof(ak->images)); | 265 | memset(ak->images, 0, sizeof(ak->images)); |
265 | memset(ak->volumes, 0, sizeof(ak->volumes)); | 266 | memset(ak->volumes, 0, sizeof(ak->volumes)); |