ALSA: pci: 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:

committed by
Takashi Iwai

parent
445a51b353
commit
e23e7a1436
@@ -1590,7 +1590,7 @@ static struct snd_pcm_ops snd_cs46xx_capture_indirect_ops = {
|
||||
#define MAX_PLAYBACK_CHANNELS 1
|
||||
#endif
|
||||
|
||||
int __devinit snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)
|
||||
int snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm **rpcm)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
@@ -1621,7 +1621,8 @@ int __devinit snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm
|
||||
|
||||
|
||||
#ifdef CONFIG_SND_CS46XX_NEW_DSP
|
||||
int __devinit snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)
|
||||
int snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device,
|
||||
struct snd_pcm **rpcm)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
@@ -1650,7 +1651,8 @@ int __devinit snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device, struct sn
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)
|
||||
int snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device,
|
||||
struct snd_pcm **rpcm)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
@@ -1679,7 +1681,8 @@ int __devinit snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device, str
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)
|
||||
int snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device,
|
||||
struct snd_pcm **rpcm)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
@@ -2092,7 +2095,7 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,
|
||||
#endif /* CONFIG_SND_CS46XX_NEW_DSP */
|
||||
|
||||
|
||||
static struct snd_kcontrol_new snd_cs46xx_controls[] __devinitdata = {
|
||||
static struct snd_kcontrol_new snd_cs46xx_controls[] = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "DAC Volume",
|
||||
@@ -2278,7 +2281,7 @@ static void snd_cs46xx_codec_reset (struct snd_ac97 * ac97)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)
|
||||
static int cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)
|
||||
{
|
||||
int idx, err;
|
||||
struct snd_ac97_template ac97;
|
||||
@@ -2311,7 +2314,7 @@ static int __devinit cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
int __devinit snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
|
||||
int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
|
||||
{
|
||||
struct snd_card *card = chip->card;
|
||||
struct snd_ctl_elem_id id;
|
||||
@@ -2531,7 +2534,7 @@ static struct snd_rawmidi_ops snd_cs46xx_midi_input =
|
||||
.trigger = snd_cs46xx_midi_input_trigger,
|
||||
};
|
||||
|
||||
int __devinit snd_cs46xx_midi(struct snd_cs46xx *chip, int device, struct snd_rawmidi **rrawmidi)
|
||||
int snd_cs46xx_midi(struct snd_cs46xx *chip, int device, struct snd_rawmidi **rrawmidi)
|
||||
{
|
||||
struct snd_rawmidi *rmidi;
|
||||
int err;
|
||||
@@ -2613,7 +2616,7 @@ static int snd_cs46xx_gameport_open(struct gameport *gameport, int mode)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit snd_cs46xx_gameport(struct snd_cs46xx *chip)
|
||||
int snd_cs46xx_gameport(struct snd_cs46xx *chip)
|
||||
{
|
||||
struct gameport *gp;
|
||||
|
||||
@@ -2649,7 +2652,7 @@ static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip)
|
||||
}
|
||||
}
|
||||
#else
|
||||
int __devinit snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }
|
||||
int snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }
|
||||
static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }
|
||||
#endif /* CONFIG_GAMEPORT */
|
||||
|
||||
@@ -2674,7 +2677,7 @@ static struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {
|
||||
.read = snd_cs46xx_io_read,
|
||||
};
|
||||
|
||||
static int __devinit snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46xx *chip)
|
||||
static int snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46xx *chip)
|
||||
{
|
||||
struct snd_info_entry *entry;
|
||||
int idx;
|
||||
@@ -3061,7 +3064,7 @@ static void cs46xx_enable_stream_irqs(struct snd_cs46xx *chip)
|
||||
snd_cs46xx_poke(chip, BA1_CIE, tmp); /* capture interrupt enable */
|
||||
}
|
||||
|
||||
int __devinit snd_cs46xx_start_dsp(struct snd_cs46xx *chip)
|
||||
int snd_cs46xx_start_dsp(struct snd_cs46xx *chip)
|
||||
{
|
||||
unsigned int tmp;
|
||||
/*
|
||||
@@ -3477,7 +3480,7 @@ struct cs_card_type
|
||||
void (*mixer_init)(struct snd_cs46xx *);
|
||||
};
|
||||
|
||||
static struct cs_card_type __devinitdata cards[] = {
|
||||
static struct cs_card_type cards[] = {
|
||||
{
|
||||
.vendor = 0x1489,
|
||||
.id = 0x7001,
|
||||
@@ -3717,10 +3720,10 @@ SIMPLE_DEV_PM_OPS(snd_cs46xx_pm, snd_cs46xx_suspend, snd_cs46xx_resume);
|
||||
/*
|
||||
*/
|
||||
|
||||
int __devinit snd_cs46xx_create(struct snd_card *card,
|
||||
struct pci_dev * pci,
|
||||
int snd_cs46xx_create(struct snd_card *card,
|
||||
struct pci_dev *pci,
|
||||
int external_amp, int thinkpad,
|
||||
struct snd_cs46xx ** rchip)
|
||||
struct snd_cs46xx **rchip)
|
||||
{
|
||||
struct snd_cs46xx *chip;
|
||||
int err, idx;
|
||||
|
Reference in New Issue
Block a user