Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Takashi Iwai and committed by
Jaroslav Kysela
517400cb 32b47da0

+23 -22
+1 -1
include/sound/ak4114.h
··· 188 188 189 189 int snd_ak4114_create(struct snd_card *card, 190 190 ak4114_read_t *read, ak4114_write_t *write, 191 - unsigned char pgm[7], unsigned char txcsb[5], 191 + const unsigned char pgm[7], const unsigned char txcsb[5], 192 192 void *private_data, struct ak4114 **r_ak4114); 193 193 void snd_ak4114_reg_write(struct ak4114 *ak4114, unsigned char reg, unsigned char mask, unsigned char val); 194 194 void snd_ak4114_reinit(struct ak4114 *ak4114);
+1 -1
include/sound/ak4117.h
··· 178 178 }; 179 179 180 180 int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t *write, 181 - unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117); 181 + const unsigned char pgm[5], void *private_data, struct ak4117 **r_ak4117); 182 182 void snd_ak4117_reg_write(struct ak4117 *ak4117, unsigned char reg, unsigned char mask, unsigned char val); 183 183 void snd_ak4117_reinit(struct ak4117 *ak4117); 184 184 int snd_ak4117_build(struct ak4117 *ak4117, struct snd_pcm_substream *capture_substream);
+2 -2
include/sound/ak4xxx-adda.h
··· 71 71 } type; 72 72 73 73 /* (array) information of combined codecs */ 74 - struct snd_akm4xxx_dac_channel *dac_info; 75 - struct snd_akm4xxx_adc_channel *adc_info; 74 + const struct snd_akm4xxx_dac_channel *dac_info; 75 + const struct snd_akm4xxx_adc_channel *adc_info; 76 76 77 77 struct snd_ak4xxx_ops ops; 78 78 };
+1 -1
sound/i2c/other/ak4114.c
··· 79 79 80 80 int snd_ak4114_create(struct snd_card *card, 81 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 83 void *private_data, struct ak4114 **r_ak4114) 84 84 { 85 85 struct ak4114 *chip;
+1 -1
sound/i2c/other/ak4117.c
··· 74 74 } 75 75 76 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 79 struct ak4117 *chip; 80 80 int err = 0;
+8 -7
sound/i2c/other/ak4xxx-adda.c
··· 140 140 * Used for AK4524 input/ouput attenuation, AK4528, and 141 141 * AK5365 input attenuation 142 142 */ 143 - static unsigned char vol_cvt_datt[128] = { 143 + static const unsigned char vol_cvt_datt[128] = { 144 144 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 145 145 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x06, 146 146 0x06, 0x07, 0x07, 0x08, 0x08, 0x08, 0x09, 0x0a, ··· 184 184 0x07, 0x00, /* 7: DAC right muted */ 185 185 0xff, 0xff 186 186 }; 187 - static unsigned char inits_ak4528[] = { 187 + static const unsigned char inits_ak4528[] = { 188 188 0x00, 0x07, /* 0: all power up */ 189 189 0x01, 0x00, /* 1: ADC/DAC reset */ 190 190 0x02, 0x60, /* 2: 24bit I2S */ ··· 194 194 0x05, 0x00, /* 5: ADC right muted */ 195 195 0xff, 0xff 196 196 }; 197 - static unsigned char inits_ak4529[] = { 197 + static const unsigned char inits_ak4529[] = { 198 198 0x09, 0x01, /* 9: ATS=0, RSTN=1 */ 199 199 0x0a, 0x3f, /* A: all power up, no zero/overflow detection */ 200 200 0x00, 0x0c, /* 0: TDM=0, 24bit I2S, SMUTE=0 */ ··· 210 210 0x08, 0x55, /* 8: deemphasis all off */ 211 211 0xff, 0xff 212 212 }; 213 - static unsigned char inits_ak4355[] = { 213 + static const unsigned char inits_ak4355[] = { 214 214 0x01, 0x02, /* 1: reset and soft-mute */ 215 215 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, 216 216 * disable DZF, sharp roll-off, RSTN#=0 */ ··· 227 227 0x01, 0x01, /* 1: un-reset, unmute */ 228 228 0xff, 0xff 229 229 }; 230 - static unsigned char inits_ak4358[] = { 230 + static const unsigned char inits_ak4358[] = { 231 231 0x01, 0x02, /* 1: reset and soft-mute */ 232 232 0x00, 0x06, /* 0: mode3(i2s), disable auto-clock detect, 233 233 * disable DZF, sharp roll-off, RSTN#=0 */ ··· 246 246 0x01, 0x01, /* 1: un-reset, unmute */ 247 247 0xff, 0xff 248 248 }; 249 - static unsigned char inits_ak4381[] = { 249 + static const unsigned char inits_ak4381[] = { 250 250 0x00, 0x0c, /* 0: mode3(i2s), disable auto-clock detect */ 251 251 0x01, 0x02, /* 1: de-emphasis off, normal speed, 252 252 * sharp roll-off, DZF off */ ··· 259 259 }; 260 260 261 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 265 memset(ak->images, 0, sizeof(ak->images)); 265 266 memset(ak->volumes, 0, sizeof(ak->volumes));
+2 -2
sound/pci/ice1712/juli.c
··· 146 146 */ 147 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 150 /* AK4117_REG_PWRDN */ AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, 151 151 /* AK4114_REQ_FORMAT */ AK4114_DIF_I24I2S, 152 152 /* AK4114_REG_IO0 */ AK4114_TX1E, ··· 154 154 /* AK4114_REG_INT0_MASK */ 0, 155 155 /* AK4114_REG_INT1_MASK */ 0 156 156 }; 157 - static unsigned char ak4114_init_txcsb[] = { 157 + static const unsigned char ak4114_init_txcsb[] = { 158 158 0x41, 0x02, 0x2c, 0x00, 0x00 159 159 }; 160 160 int err;
+7 -7
sound/pci/ice1712/revo.c
··· 185 185 186 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 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 193 AK_DAC("PCM Center Playback Volume", 1), 194 194 AK_DAC("PCM LFE Playback Volume", 1), 195 195 AK_DAC("PCM Side Playback Volume", 2), 196 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 200 AK_DAC("PCM Playback Volume", 2), 201 201 AK_DAC("PCM Center Playback Volume", 1), 202 202 AK_DAC("PCM LFE Playback Volume", 1), ··· 210 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 215 .name = "PCM Capture Volume", 216 216 .switch_name = "PCM Capture Switch", ··· 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 223 .type = SND_AK4381, 224 224 .num_dacs = 2, 225 225 .ops = { ··· 320 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 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 328 .type = SND_AK4358, 329 329 .num_dacs = 2, 330 330 .ops = {