Commit 32b47da0 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Add 'const' to files in pci/ice1712/ 



Mark a lot of data as 'const'
Signed-of-by: default avatarPhilipp Matthias Hahn <pmhahn@pmhahn.de>

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 189bc171

sound/pci/ice1712/amp.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val) 


static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)

{

	static unsigned short wm_inits[] = {

	static const unsigned short wm_inits[] = {

		WM_ATTEN_L,	0x0000,	/* 0 db */

		WM_ATTEN_R,	0x0000,	/* 0 db */

		WM_DAC_CTRL,	0x0008,	/* 24bit I2S */
@@ -75,7 +75,7 @@ static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) 




/* entry point */

struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {

const struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {

	{

		.subvendor = VT1724_SUBDEVICE_AV710,

		.name = "Chaintech AV-710",

sound/pci/ice1712/amp.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define WM_DAC_CTRL	0x02

#define WM_INT_CTRL	0x03



extern struct snd_ice1712_card_info  snd_vt1724_amp_cards[];

extern const struct snd_ice1712_card_info  snd_vt1724_amp_cards[];





#endif /* __SOUND_AMP_H */

sound/pci/ice1712/aureon.c

+20 −22
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static unsigned short aureon_ac97_read(struct snd_ice1712 *ice, unsigned short r 
static int aureon_ac97_init (struct snd_ice1712 *ice)

{

	int i;

	static unsigned short ac97_defaults[] = {

	static const unsigned short ac97_defaults[] = {

		0x00, 0x9640,

		0x02, 0x8000,

		0x04, 0x8000,
@@ -674,7 +674,7 @@ static DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0); 
 * Logarithmic volume values for WM8770

 * Computed as 20 * Log10(255 / x)

 */

static unsigned char wm_vol[256] = {

static const unsigned char wm_vol[256] = {

	127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,

	23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,

	17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
@@ -1067,14 +1067,14 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val 
 */

static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	static char *texts[] = {

	static const char * const texts[] = {

		"CD",		//AIN1

		"Aux",		//AIN2

		"Line",		//AIN3

		"Mic",		//AIN4

		"AC97"		//AIN5

	};

	static char *universe_texts[] = {

	static const char * const universe_texts[] = {

		"Aux1",		//AIN1

		"CD",		//AIN2

		"Phono",	//AIN3
@@ -1140,11 +1140,11 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val 
static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

{

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);

	static char *aureon_texts[] = {

	static const char * const aureon_texts[] = {

		"CD",		//RXP0

		"Optical"	//RXP1

	};

	static char *prodigy_texts[] = {

	static const char * const prodigy_texts[] = {

		"CD",

		"Coax"

	};
@@ -1368,7 +1368,7 @@ static int aureon_deemp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v 
 */

static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo)

{

	static char *texts[2] = { "128x", "64x"	};

	static const char * const texts[2] = { "128x", "64x"	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;
@@ -1411,7 +1411,7 @@ static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl 
 * mixers

 */



static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {

static const struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Master Playback Switch",
@@ -1526,7 +1526,7 @@ static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = { 
	}

};



static struct snd_kcontrol_new wm_controls[] __devinitdata = {

static const struct snd_kcontrol_new wm_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "PCM Playback Switch",
@@ -1592,7 +1592,7 @@ static struct snd_kcontrol_new wm_controls[] __devinitdata = { 
	}

};



static struct snd_kcontrol_new ac97_controls[] __devinitdata = {

static const struct snd_kcontrol_new ac97_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "AC97 Playback Switch",
@@ -1697,7 +1697,7 @@ static struct snd_kcontrol_new ac97_controls[] __devinitdata = { 
 	}

};



static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {

static const struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "AC97 Playback Switch",
@@ -1829,8 +1829,7 @@ static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = { 


};



	

static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {

static const struct snd_kcontrol_new cs8415_controls[] __devinitdata = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
@@ -1875,7 +1874,6 @@ static struct snd_kcontrol_new cs8415_controls[] __devinitdata = { 
	}

};



 

static int __devinit aureon_add_controls(struct snd_ice1712 *ice)

{

	unsigned int i, counts;
@@ -1943,7 +1941,7 @@ static int __devinit aureon_add_controls(struct snd_ice1712 *ice) 
 */

static int __devinit aureon_init(struct snd_ice1712 *ice)

{

	static unsigned short wm_inits_aureon[] = {

	static const unsigned short wm_inits_aureon[] = {

		/* These come first to reduce init pop noise */

		0x1b, 0x044,		/* ADC Mux (AC'97 source) */

		0x1c, 0x00B,		/* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
@@ -1979,7 +1977,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
		0x1a, 0x000,		/* -12dB ADC/R */

		(unsigned short)-1

	};

	static unsigned short wm_inits_prodigy[] = {

	static const unsigned short wm_inits_prodigy[] = {



		/* These come first to reduce init pop noise */

		0x1b, 0x000,		/* ADC Mux */
@@ -2021,7 +2019,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
		(unsigned short)-1



	};

	static unsigned short cs_inits[] = {

	static const unsigned short cs_inits[] = {

		0x0441, /* RUN */

		0x0180, /* no mute, OMCK output on RMCK pin */

		0x0201, /* S/PDIF source on RXP1 */
@@ -2029,7 +2027,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
		(unsigned short)-1

	};

	unsigned int tmp;

	unsigned short *p;

	const unsigned short *p;

	int err, i;



	if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON51_SKY) {
@@ -2109,7 +2107,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
 * hence the driver needs to sets up it properly.

 */



static unsigned char aureon51_eeprom[] __devinitdata = {

static const unsigned char aureon51_eeprom[] __devinitdata = {

	[ICE_EEP2_SYSCONF]     = 0x0a,	/* clock 512, spdif-in/ADC, 3DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */
@@ -2125,7 +2123,7 @@ static unsigned char aureon51_eeprom[] __devinitdata = { 
	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



static unsigned char aureon71_eeprom[] __devinitdata = {

static const unsigned char aureon71_eeprom[] __devinitdata = {

	[ICE_EEP2_SYSCONF]     = 0x0b,	/* clock 512, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */
@@ -2142,7 +2140,7 @@ static unsigned char aureon71_eeprom[] __devinitdata = { 
};

#define prodigy71_eeprom aureon71_eeprom



static unsigned char prodigy71lt_eeprom[] __devinitdata = {

static const unsigned char prodigy71lt_eeprom[] __devinitdata = {

	[ICE_EEP2_SYSCONF]     = 0x4b,	/* clock 384, spdif-in/ADC, 4DACs */

	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */

	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */
@@ -2160,7 +2158,7 @@ static unsigned char prodigy71lt_eeprom[] __devinitdata = { 
#define prodigy71xt_eeprom prodigy71lt_eeprom



/* entry point */

struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {

const struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {

	{

		.subvendor = VT1724_SUBDEVICE_AUREON51_SKY,

		.name = "Terratec Aureon 5.1-Sky",

sound/pci/ice1712/aureon.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define VT1724_SUBDEVICE_PRODIGY71LT	0x32315441	/* PRODIGY 7.1 LT */

#define VT1724_SUBDEVICE_PRODIGY71XT	0x36315441	/* PRODIGY 7.1 XT*/



extern struct snd_ice1712_card_info  snd_vt1724_aureon_cards[];

extern const struct snd_ice1712_card_info  snd_vt1724_aureon_cards[];



/* GPIO bits */

#define AUREON_CS8415_CS	(1 << 22)

sound/pci/ice1712/delta.c

+17 −17
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco 
	return 0;

}



static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =

{

	.access =	(SNDRV_CTL_ELEM_ACCESS_READ),

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -429,7 +429,7 @@ static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devini 
 * initialize the chips on M-Audio cards

 */



static struct snd_akm4xxx akm_audiophile __devinitdata = {

static const struct snd_akm4xxx akm_audiophile __devinitdata = {

	.type = SND_AK4528,

	.num_adcs = 2,

	.num_dacs = 2,
@@ -438,7 +438,7 @@ static struct snd_akm4xxx akm_audiophile __devinitdata = { 
	}

};



static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {

static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {

	.caddr = 2,

	.cif = 0,

	.data_mask = ICE1712_DELTA_AP_DOUT,
@@ -450,7 +450,7 @@ static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { 
	.mask_flags = 0,

};



static struct snd_akm4xxx akm_delta410 __devinitdata = {

static const struct snd_akm4xxx akm_delta410 __devinitdata = {

	.type = SND_AK4529,

	.num_adcs = 2,

	.num_dacs = 8,
@@ -459,7 +459,7 @@ static struct snd_akm4xxx akm_delta410 __devinitdata = { 
	}

};



static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {

static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {

	.caddr = 0,

	.cif = 0,

	.data_mask = ICE1712_DELTA_AP_DOUT,
@@ -471,7 +471,7 @@ static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { 
	.mask_flags = 0,

};



static struct snd_akm4xxx akm_delta1010lt __devinitdata = {

static const struct snd_akm4xxx akm_delta1010lt __devinitdata = {

	.type = SND_AK4524,

	.num_adcs = 8,

	.num_dacs = 8,
@@ -481,7 +481,7 @@ static struct snd_akm4xxx akm_delta1010lt __devinitdata = { 
	}

};



static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {

static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {

	.caddr = 2,

	.cif = 0, /* the default level of the CIF pin from AK4524 */

	.data_mask = ICE1712_DELTA_1010LT_DOUT,
@@ -493,7 +493,7 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { 
	.mask_flags = 0,

};



static struct snd_akm4xxx akm_delta44 __devinitdata = {

static const struct snd_akm4xxx akm_delta44 __devinitdata = {

	.type = SND_AK4524,

	.num_adcs = 4,

	.num_dacs = 4,
@@ -503,7 +503,7 @@ static struct snd_akm4xxx akm_delta44 __devinitdata = { 
	}

};



static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {

static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {

	.caddr = 2,

	.cif = 0, /* the default level of the CIF pin from AK4524 */

	.data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA,
@@ -515,7 +515,7 @@ static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { 
	.mask_flags = 0,

};



static struct snd_akm4xxx akm_vx442 __devinitdata = {

static const struct snd_akm4xxx akm_vx442 __devinitdata = {

	.type = SND_AK4524,

	.num_adcs = 4,

	.num_dacs = 4,
@@ -525,7 +525,7 @@ static struct snd_akm4xxx akm_vx442 __devinitdata = { 
	}

};



static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {

static const struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {

	.caddr = 2,

	.cif = 0,

	.data_mask = ICE1712_VX442_DOUT,
@@ -650,15 +650,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) 
 * additional controls for M-Audio cards

 */



static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =

ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);

static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =

ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0);

static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =

ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);

static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =

ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);

static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =

static const struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =

ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
@@ -735,7 +735,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) 




/* entry point */

struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {

const struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {

	{

		.subvendor = ICE1712_SUBDEVICE_DELTA1010,

		.name = "M Audio Delta 1010",