Commit 1282c824 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/section-fix' into for-linus 

* topic/section-fix:
  ALSA: Add missing __devexit_p() markers
  ALSA: powermac - Replace the rest of __init*
  ALSA: sound/ppc: update annotations of serveral functions
parents 45d60e36 82ced6fd

sound/isa/es1688/es1688.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int __devexit snd_es1688_remove(struct device *dev, unsigned int n) 
static struct isa_driver snd_es1688_driver = {

	.match		= snd_es1688_match,

	.probe		= snd_es1688_probe,

	.remove		= snd_es1688_remove,

	.remove		= __devexit_p(snd_es1688_remove),

#if 0	/* FIXME */

	.suspend	= snd_es1688_suspend,

	.resume		= snd_es1688_resume,

sound/isa/gus/gusextreme.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n) 
static struct isa_driver snd_gusextreme_driver = {

	.match		= snd_gusextreme_match,

	.probe		= snd_gusextreme_probe,

	.remove		= snd_gusextreme_remove,

	.remove		= __devexit_p(snd_gusextreme_remove),

#if 0	/* FIXME */

	.suspend	= snd_gusextreme_suspend,

	.resume		= snd_gusextreme_resume,

sound/parisc/harmony.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_driver = { 
	.name = "harmony",

	.id_table = snd_harmony_devtable,

	.probe = snd_harmony_probe,

	.remove = snd_harmony_remove,

	.remove = __devexit_p(snd_harmony_remove),

};



static int __init

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[] __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);
@@ -872,7 +872,7 @@ static void snd_pmac_awacs_update_automute(struct snd_pmac *chip, int do_notify) 
/*

 * initialize chip

 */

int __init

int __devinit

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 __init snd_pmac_attach_beep(struct snd_pmac *chip)

int __devinit snd_pmac_attach_beep(struct snd_pmac *chip)

{

	struct pmac_beep *beep;

	struct input_dev *input_dev;