dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Bill Pemberton 2012-12-06 12:35:23 -05:00 committed by Takashi Iwai
parent 5cc3203f72
commit 15afafc256
8 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sound/ppc/awacs.c
View File

@ -477,7 +477,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol,
#define AMP_CH_SPK 0 #define AMP_CH_SPK 0
#define AMP_CH_HD 1 #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, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Speaker Playback Volume", .name = "Speaker Playback Volume",
.info = snd_pmac_awacs_info_volume_amp, .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, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Headphone Playback Switch", .name = "Headphone Playback Switch",
.info = snd_pmac_boolean_stereo_info, .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, .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, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Speaker Playback Switch", .name = "Speaker Playback Switch",
.info = snd_pmac_boolean_stereo_info, .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 * 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_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0),
AWACS_VOLUME("Master Capture Volume", 0, 4, 0), AWACS_VOLUME("Master Capture Volume", 0, 4, 0),
/* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 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("Master Playback Volume", 2, 6, 1),
AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1),
AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 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), 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_VOLUME("Play-through Playback Volume", 5, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), 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("Line out Playback Volume", 2, 6, 1),
AWACS_VOLUME("Master Playback Volume", 5, 6, 1), AWACS_VOLUME("Master Playback Volume", 5, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),
AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 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_VOLUME("Line out Playback Volume", 2, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),
AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 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), 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_VOLUME("Master Playback Volume", 2, 6, 1),
AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), 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? /* FIXME: is this correct order?
* screamer (powerbook G3 pismo) seems to have different bits... * 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("Line Capture Switch", 0, SHIFT_MUX_LINE, 0),
AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 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("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),
AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 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), 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); 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); 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); 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), 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, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Mic Boost Capture Volume", .name = "Mic Boost Capture Volume",
.info = snd_pmac_screamer_mic_boost_info, .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), 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("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),
AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 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("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),
AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 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), 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); 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); 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); 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 * initialize chip
*/ */
int __devinit int
snd_pmac_awacs_init(struct snd_pmac *chip) snd_pmac_awacs_init(struct snd_pmac *chip)
{ {
int pm7500 = IS_PM7500; int pm7500 = IS_PM7500;

2
sound/ppc/beep.c
View File

@ -215,7 +215,7 @@ static struct snd_kcontrol_new snd_pmac_beep_mixer = {
}; };
/* Initialize beep stuff */ /* 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 pmac_beep *beep;
struct input_dev *input_dev; struct input_dev *input_dev;

22
sound/ppc/burgundy.c
View File

@ -467,7 +467,7 @@ static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol,
/* /*
* Burgundy mixers * 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, BURGUNDY_VOLUME_W("Master Playback Volume", 0,
MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),
BURGUNDY_VOLUME_W("CD Capture Volume", 0, 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, */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0,
MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 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, BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
MASK_ADDR_BURGUNDY_VOLLINE, 16), MASK_ADDR_BURGUNDY_VOLLINE, 16),
BURGUNDY_VOLUME_W("Mic Capture Volume", 0, 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, BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0,
MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) 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, BURGUNDY_VOLUME_W("Line in Capture Volume", 0,
MASK_ADDR_BURGUNDY_VOLMIC, 16), MASK_ADDR_BURGUNDY_VOLMIC, 16),
BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, 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, /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0,
* MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */ * 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, BURGUNDY_SWITCH_B("Master Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT, BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT,
BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1); 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, BURGUNDY_SWITCH_B("Master Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_OUTPUT_INTERN BURGUNDY_OUTPUT_INTERN
| BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 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, BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); 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, BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_OUTPUT_INTERN, 0, 0); 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, BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1); 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, BURGUNDY_SWITCH_B("Line out Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); 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, BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,
MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,
BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1); 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 * 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 imac = of_machine_is_compatible("iMac");
int i, err; int i, err;

2
sound/ppc/daca.c
View File

@ -244,7 +244,7 @@ static void daca_cleanup(struct snd_pmac *chip)
} }
/* exported */ /* exported */
int __devinit snd_pmac_daca_init(struct snd_pmac *chip) int snd_pmac_daca_init(struct snd_pmac *chip)
{ {
int i, err; int i, err;
struct pmac_daca *mix; struct pmac_daca *mix;

4
sound/ppc/keywest.c
View File

@ -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; int err;
@ -130,7 +130,7 @@ int __devinit snd_pmac_tumbler_post_init(void)
} }
/* exported */ /* exported */
int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c) int snd_pmac_keywest_init(struct pmac_keywest *i2c)
{ {
int err; int err;

12
sound/ppc/pmac.c
View File

@ -702,7 +702,7 @@ static struct snd_pcm_ops snd_pmac_capture_ops = {
.pointer = snd_pmac_capture_pointer, .pointer = snd_pmac_capture_pointer,
}; };
int __devinit snd_pmac_pcm_new(struct snd_pmac *chip) int snd_pmac_pcm_new(struct snd_pmac *chip)
{ {
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
@ -907,7 +907,7 @@ static int snd_pmac_dev_free(struct snd_device *device)
* check the machine support byteswap (little-endian) * check the machine support byteswap (little-endian)
*/ */
static void __devinit detect_byte_swap(struct snd_pmac *chip) static void detect_byte_swap(struct snd_pmac *chip)
{ {
struct device_node *mio; struct device_node *mio;
@ -933,7 +933,7 @@ static void __devinit detect_byte_swap(struct snd_pmac *chip)
/* /*
* detect a sound chip * detect a sound chip
*/ */
static int __devinit snd_pmac_detect(struct snd_pmac *chip) static int snd_pmac_detect(struct snd_pmac *chip)
{ {
struct device_node *sound; struct device_node *sound;
struct device_node *dn; struct device_node *dn;
@ -1146,7 +1146,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static struct snd_kcontrol_new auto_mute_controls[] __devinitdata = { static struct snd_kcontrol_new auto_mute_controls[] = {
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Auto Mute Switch", .name = "Auto Mute Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
@ -1161,7 +1161,7 @@ static struct snd_kcontrol_new auto_mute_controls[] __devinitdata = {
}, },
}; };
int __devinit snd_pmac_add_automute(struct snd_pmac *chip) int snd_pmac_add_automute(struct snd_pmac *chip)
{ {
int err; int err;
chip->auto_mute = 1; chip->auto_mute = 1;
@ -1178,7 +1178,7 @@ int __devinit snd_pmac_add_automute(struct snd_pmac *chip)
/* /*
* create and detect a pmac chip record * create and detect a pmac chip record
*/ */
int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
{ {
struct snd_pmac *chip; struct snd_pmac *chip;
struct device_node *np; struct device_node *np;

6
sound/ppc/powermac.c
View File

@ -51,7 +51,7 @@ static struct platform_device *device;
/* /*
*/ */
static int __devinit snd_pmac_probe(struct platform_device *devptr) static int snd_pmac_probe(struct platform_device *devptr)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_pmac *chip; struct snd_pmac *chip;
@ -136,7 +136,7 @@ __error:
} }
static int __devexit snd_pmac_remove(struct platform_device *devptr) static int snd_pmac_remove(struct platform_device *devptr)
{ {
snd_card_free(platform_get_drvdata(devptr)); snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL); platform_set_drvdata(devptr, NULL);
@ -168,7 +168,7 @@ static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_r
static struct platform_driver snd_pmac_driver = { static struct platform_driver snd_pmac_driver = {
.probe = snd_pmac_probe, .probe = snd_pmac_probe,
.remove = __devexit_p(snd_pmac_remove), .remove = snd_pmac_remove,
.driver = { .driver = {
.name = SND_PMAC_DRIVER, .name = SND_PMAC_DRIVER,
.owner = THIS_MODULE, .owner = THIS_MODULE,

16
sound/ppc/tumbler.c
View File

@ -844,7 +844,7 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol,
/* /*
*/ */
static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = { static struct snd_kcontrol_new tumbler_mixers[] = {
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Volume", .name = "Master Playback Volume",
.info = tumbler_info_master_volume, .info = tumbler_info_master_volume,
@ -868,7 +868,7 @@ static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = {
}, },
}; };
static struct snd_kcontrol_new snapper_mixers[] __devinitdata = { static struct snd_kcontrol_new snapper_mixers[] = {
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Master Playback Volume", .name = "Master Playback Volume",
.info = tumbler_info_master_volume, .info = tumbler_info_master_volume,
@ -901,7 +901,7 @@ static struct snd_kcontrol_new snapper_mixers[] __devinitdata = {
}, },
}; };
static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { static struct snd_kcontrol_new tumbler_hp_sw = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Headphone Playback Switch", .name = "Headphone Playback Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
@ -909,7 +909,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = {
.put = tumbler_put_mute_switch, .put = tumbler_put_mute_switch,
.private_value = TUMBLER_MUTE_HP, .private_value = TUMBLER_MUTE_HP,
}; };
static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { static struct snd_kcontrol_new tumbler_speaker_sw = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Speaker Playback Switch", .name = "Speaker Playback Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
@ -917,7 +917,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = {
.put = tumbler_put_mute_switch, .put = tumbler_put_mute_switch,
.private_value = TUMBLER_MUTE_AMP, .private_value = TUMBLER_MUTE_AMP,
}; };
static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = { static struct snd_kcontrol_new tumbler_lineout_sw = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Line Out Playback Switch", .name = "Line Out Playback Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
@ -925,7 +925,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = {
.put = tumbler_put_mute_switch, .put = tumbler_put_mute_switch,
.private_value = TUMBLER_MUTE_LINE, .private_value = TUMBLER_MUTE_LINE,
}; };
static struct snd_kcontrol_new tumbler_drc_sw __devinitdata = { static struct snd_kcontrol_new tumbler_drc_sw = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "DRC Switch", .name = "DRC Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
@ -1276,7 +1276,7 @@ static void tumbler_resume(struct snd_pmac *chip)
#endif #endif
/* initialize tumbler */ /* initialize tumbler */
static int __devinit tumbler_init(struct snd_pmac *chip) static int tumbler_init(struct snd_pmac *chip)
{ {
int irq; int irq;
struct pmac_tumbler *mix = chip->mixer_data; struct pmac_tumbler *mix = chip->mixer_data;
@ -1349,7 +1349,7 @@ static void tumbler_cleanup(struct snd_pmac *chip)
} }
/* exported */ /* exported */
int __devinit snd_pmac_tumbler_init(struct snd_pmac *chip) int snd_pmac_tumbler_init(struct snd_pmac *chip)
{ {
int i, err; int i, err;
struct pmac_tumbler *mix; struct pmac_tumbler *mix;