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

Commit 15afafc2 authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

ALSA: ppc: remove __dev* attributes 



CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5cc3203f

sound/ppc/awacs.c

+27 −27
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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Speaker Playback Volume",

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

};



static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw = {

	.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 __devinitdata = { 
	.private_value = AMP_CH_HD,

};



static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] = {

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

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] = {

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

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] = {

	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[] __devinitdata = { 
/* FIXME: is this correct order?

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

 */

static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] = {

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] = {

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

};



static struct snd_kcontrol_new snd_pmac_awacs_master_sw __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw =

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



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac =

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



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 =

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



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] = {

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

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] = {

	{ .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[] __devinitdata = { 
	},

};



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] =

{

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

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __devinitdata =

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] =

{

	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[] __devinitdata =

static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] =

{

	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] = {

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

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw =

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



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 =

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



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata =

static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 =

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 0);
@@ -872,7 +872,7 @@ static void snd_pmac_awacs_update_automute(struct snd_pmac *chip, int do_notify) 
/*

 * initialize chip

 */

int __devinit

int

snd_pmac_awacs_init(struct snd_pmac *chip)

{

	int pm7500 = IS_PM7500;

sound/ppc/beep.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static struct snd_kcontrol_new snd_pmac_beep_mixer = { 
};



/* Initialize beep stuff */

int __devinit snd_pmac_attach_beep(struct snd_pmac *chip)

int snd_pmac_attach_beep(struct snd_pmac *chip)

{

	struct pmac_beep *beep;

	struct input_dev *input_dev;

sound/ppc/burgundy.c

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

 * Burgundy mixers

 */

static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] = {

	BURGUNDY_VOLUME_W("Master Playback Volume", 0,

			MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),

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

			MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0)

};

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLLINE, 16),

	BURGUNDY_VOLUME_W("Mic Capture Volume", 0,
@@ -521,7 +521,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = { 
	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[] __devinitdata = {

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLMIC, 16),

	BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
@@ -537,33 +537,33 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = { 
/*	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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac =

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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac =

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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac =

BURGUNDY_SWITCH_B("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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac =

BURGUNDY_SWITCH_B("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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac =

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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac =

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 __devinitdata =

static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac =

BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1);
@@ -617,7 +617,7 @@ static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_noti 
/*

 * initialize burgundy

 */

int __devinit snd_pmac_burgundy_init(struct snd_pmac *chip)

int snd_pmac_burgundy_init(struct snd_pmac *chip)

{

	int imac = of_machine_is_compatible("iMac");

	int i, err;

sound/ppc/daca.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void daca_cleanup(struct snd_pmac *chip) 
}



/* exported */

int __devinit snd_pmac_daca_init(struct snd_pmac *chip)

int snd_pmac_daca_init(struct snd_pmac *chip)

{

	int i, err;

	struct pmac_daca *mix;

sound/ppc/keywest.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) 
	}

}



int __devinit snd_pmac_tumbler_post_init(void)

int snd_pmac_tumbler_post_init(void)

{

	int err;
@@ -130,7 +130,7 @@ int __devinit snd_pmac_tumbler_post_init(void) 
}



/* exported */

int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c)

int snd_pmac_keywest_init(struct pmac_keywest *i2c)

{

	int err;