Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b60f6b0 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix conflicts between const and __devinitdata 



Marvin told with a depressed face,
  gcc doesn't like both __devinitdata and const in the same line.
So, remove const from all over places now...

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

sound/pci/azt3328.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ snd_azf3328_put_mixer_enum(struct snd_kcontrol *kcontrol, 
	return (nreg != oreg);

}



static const struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = {

static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = {

	AZF3328_MIXER_SWITCH("Master Playback Switch", IDX_MIXER_PLAY_MASTER, 15, 1),

	AZF3328_MIXER_VOL_STEREO("Master Playback Volume", IDX_MIXER_PLAY_MASTER, 0x1f, 1),

	AZF3328_MIXER_SWITCH("Wave Playback Switch", IDX_MIXER_WAVEOUT, 15, 1),
@@ -678,7 +678,7 @@ static const struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata 
#endif

};



static const u16 __devinitdata snd_azf3328_init_values[][2] = {

static u16 __devinitdata snd_azf3328_init_values[][2] = {

        { IDX_MIXER_PLAY_MASTER,	MIXER_MUTE_MASK|0x1f1f },

        { IDX_MIXER_MODEMOUT,		MIXER_MUTE_MASK|0x1f1f },

	{ IDX_MIXER_BASSTREBLE,		0x0000 },

sound/pci/ice1712/amp.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) 




/* entry point */

const struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {

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 const struct snd_ice1712_card_info  snd_vt1724_amp_cards[];

extern struct snd_ice1712_card_info  snd_vt1724_amp_cards[];





#endif /* __SOUND_AMP_H */

sound/pci/ice1712/aureon.c

+9 −9
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl 
 * mixers

 */



static const struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {

static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

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

};



static const struct snd_kcontrol_new wm_controls[] __devinitdata = {

static struct snd_kcontrol_new wm_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

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

};



static const struct snd_kcontrol_new ac97_controls[] __devinitdata = {

static struct snd_kcontrol_new ac97_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

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

};



static const struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {

static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {

 	{

 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

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


};



static const struct snd_kcontrol_new cs8415_controls[] __devinitdata = {

static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
@@ -2107,7 +2107,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice) 
 * hence the driver needs to sets up it properly.

 */



static const unsigned char aureon51_eeprom[] __devinitdata = {

static 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 */
@@ -2123,7 +2123,7 @@ static const unsigned char aureon51_eeprom[] __devinitdata = { 
	[ICE_EEP2_GPIO_STATE2] = 0x00,

};



static const unsigned char aureon71_eeprom[] __devinitdata = {

static 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 */
@@ -2140,7 +2140,7 @@ static const unsigned char aureon71_eeprom[] __devinitdata = { 
};

#define prodigy71_eeprom aureon71_eeprom



static const unsigned char prodigy71lt_eeprom[] __devinitdata = {

static 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 */
@@ -2158,7 +2158,7 @@ static const unsigned char prodigy71lt_eeprom[] __devinitdata = { 
#define prodigy71xt_eeprom prodigy71lt_eeprom



/* entry point */

const struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {

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 const struct snd_ice1712_card_info  snd_vt1724_aureon_cards[];

extern struct snd_ice1712_card_info  snd_vt1724_aureon_cards[];



/* GPIO bits */

#define AUREON_CS8415_CS	(1 << 22)