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

Commit 3e1e0a5d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: powermac - Replace the rest of __init* 



All __initdata should be __devinitdata as platform device is hotpluggable.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5c9b6e9e

sound/ppc/awacs.c

+26 −26
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol, 
#define AMP_CH_SPK	0

#define AMP_CH_HD	1



static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "PC Speaker Playback Volume",

	  .info = snd_pmac_awacs_info_volume_amp,
@@ -514,7 +514,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = { 
	},

};



static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Headphone Playback Switch",

	.info = snd_pmac_boolean_stereo_info,
@@ -523,7 +523,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = { 
	.private_value = AMP_CH_HD,

};



static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PC Speaker Playback Switch",

	.info = snd_pmac_boolean_stereo_info,
@@ -595,46 +595,46 @@ static int snd_pmac_screamer_mic_boost_put(struct snd_kcontrol *kcontrol, 
/*

 * lists of mixer elements

 */

static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __devinitdata = {

	AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0),

	AWACS_VOLUME("Master Capture Volume", 0, 4, 0),

/*	AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __devinitdata = {

	AWACS_VOLUME("Master Playback Volume", 2, 6, 1),

	AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __devinitdata = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __devinitdata = {

	AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __devinitdata = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

	AWACS_VOLUME("Master Playback Volume", 5, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __devinitdata = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __devinitdata = {

	AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __devinitdata = {

	AWACS_VOLUME("Master Playback Volume", 2, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};
@@ -642,34 +642,34 @@ static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { 
/* FIXME: is this correct order?

 * screamer (powerbook G3 pismo) seems to have different bits...

 */

static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __devinitdata = {

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0),

	AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __devinitdata = {

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

	AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __devinitdata = {

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_master_sw __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw __devinitdata =

AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __devinitdata =

AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __devinitdata =

AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __devinitdata = {

	AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Mic Boost Capture Volume",

	  .info = snd_pmac_screamer_mic_boost_info,
@@ -678,34 +678,34 @@ static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { 
	},

};



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __devinitdata =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __initdata =

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __devinitdata =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

	AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __initdata =

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __devinitdata =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

	AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __initdata = {

static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __devinitdata = {

	AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __initdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata =

AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0);

sound/ppc/burgundy.c

+10 −10
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol, 
/*

 * Burgundy mixers

 */

static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __devinitdata = {

	BURGUNDY_VOLUME_W("Master Playback Volume", 0,

			MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),

	BURGUNDY_VOLUME_W("CD Capture Volume", 0,
@@ -496,7 +496,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = { 
 */	BURGUNDY_SWITCH_B("PCM Capture Switch", 0,

			MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0)

};

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLLINE, 16),

	BURGUNDY_VOLUME_W("Mic Capture Volume", 0,
@@ -522,7 +522,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = { 
	BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0,

			MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1)

};

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLMIC, 16),

	BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
@@ -538,33 +538,33 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = { 
/*	BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0,

 *		MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */

};

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __devinitdata =

BURGUNDY_SWITCH_B("Master Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT,

	BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __devinitdata =

BURGUNDY_SWITCH_B("Master Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_INTERN

	| BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata =

BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata =

BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_INTERN, 0, 0);

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata =

BURGUNDY_SWITCH_B("Line out Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __devinitdata =

BURGUNDY_SWITCH_B("Line out Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __initdata =

static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __devinitdata =

BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1);

sound/ppc/pmac.c

+2 −2
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static int snd_pmac_dev_free(struct snd_device *device) 
 * check the machine support byteswap (little-endian)

 */



static void __init detect_byte_swap(struct snd_pmac *chip)

static void __devinit detect_byte_swap(struct snd_pmac *chip)

{

	struct device_node *mio;
@@ -1143,7 +1143,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct snd_kcontrol_new auto_mute_controls[] __initdata = {

static struct snd_kcontrol_new auto_mute_controls[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Auto Mute Switch",

	  .info = snd_pmac_boolean_mono_info,

sound/ppc/tumbler.c

+6 −6
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol, 


/*

 */

static struct snd_kcontrol_new tumbler_mixers[] __initdata = {

static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Master Playback Volume",

	  .info = tumbler_info_master_volume,
@@ -862,7 +862,7 @@ static struct snd_kcontrol_new tumbler_mixers[] __initdata = { 
	},

};



static struct snd_kcontrol_new snapper_mixers[] __initdata = {

static struct snd_kcontrol_new snapper_mixers[] __devinitdata = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Master Playback Volume",

	  .info = tumbler_info_master_volume,
@@ -895,7 +895,7 @@ static struct snd_kcontrol_new snapper_mixers[] __initdata = { 
	},

};



static struct snd_kcontrol_new tumbler_hp_sw __initdata = {

static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Headphone Playback Switch",

	.info = snd_pmac_boolean_mono_info,
@@ -903,7 +903,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __initdata = { 
	.put = tumbler_put_mute_switch,

	.private_value = TUMBLER_MUTE_HP,

};

static struct snd_kcontrol_new tumbler_speaker_sw __initdata = {

static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PC Speaker Playback Switch",

	.info = snd_pmac_boolean_mono_info,
@@ -911,7 +911,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw __initdata = { 
	.put = tumbler_put_mute_switch,

	.private_value = TUMBLER_MUTE_AMP,

};

static struct snd_kcontrol_new tumbler_lineout_sw __initdata = {

static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Line Out Playback Switch",

	.info = snd_pmac_boolean_mono_info,
@@ -919,7 +919,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw __initdata = { 
	.put = tumbler_put_mute_switch,

	.private_value = TUMBLER_MUTE_LINE,

};

static struct snd_kcontrol_new tumbler_drc_sw __initdata = {

static struct snd_kcontrol_new tumbler_drc_sw __devinitdata = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "DRC Switch",

	.info = snd_pmac_boolean_mono_info,