ALSA: drivers: 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>
此提交包含在:
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(nopcm, "Disable PC-Speaker PCM sound. Only beeps remain.");
|
||||
|
||||
struct snd_pcsp pcsp_chip;
|
||||
|
||||
static int __devinit snd_pcsp_create(struct snd_card *card)
|
||||
static int snd_pcsp_create(struct snd_card *card)
|
||||
{
|
||||
static struct snd_device_ops ops = { };
|
||||
struct timespec tp;
|
||||
@@ -93,7 +93,7 @@ static int __devinit snd_pcsp_create(struct snd_card *card)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
|
||||
static int snd_card_pcsp_probe(int devnum, struct device *dev)
|
||||
{
|
||||
struct snd_card *card;
|
||||
int err;
|
||||
@@ -142,7 +142,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit alsa_card_pcsp_init(struct device *dev)
|
||||
static int alsa_card_pcsp_init(struct device *dev)
|
||||
{
|
||||
int err;
|
||||
|
||||
@@ -161,12 +161,12 @@ static int __devinit alsa_card_pcsp_init(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit alsa_card_pcsp_exit(struct snd_pcsp *chip)
|
||||
static void alsa_card_pcsp_exit(struct snd_pcsp *chip)
|
||||
{
|
||||
snd_card_free(chip->card);
|
||||
}
|
||||
|
||||
static int __devinit pcsp_probe(struct platform_device *dev)
|
||||
static int pcsp_probe(struct platform_device *dev)
|
||||
{
|
||||
int err;
|
||||
|
||||
@@ -184,7 +184,7 @@ static int __devinit pcsp_probe(struct platform_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit pcsp_remove(struct platform_device *dev)
|
||||
static int pcsp_remove(struct platform_device *dev)
|
||||
{
|
||||
struct snd_pcsp *chip = platform_get_drvdata(dev);
|
||||
alsa_card_pcsp_exit(chip);
|
||||
@@ -227,7 +227,7 @@ static struct platform_driver pcsp_platform_driver = {
|
||||
.pm = PCSP_PM_OPS,
|
||||
},
|
||||
.probe = pcsp_probe,
|
||||
.remove = __devexit_p(pcsp_remove),
|
||||
.remove = pcsp_remove,
|
||||
.shutdown = pcsp_shutdown,
|
||||
};
|
||||
|
||||
|
@@ -77,7 +77,7 @@ static int pcspkr_input_event(struct input_dev *dev, unsigned int type,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit pcspkr_input_init(struct input_dev **rdev, struct device *dev)
|
||||
int pcspkr_input_init(struct input_dev **rdev, struct device *dev)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
@@ -7,7 +7,7 @@
|
||||
#ifndef __PCSP_INPUT_H__
|
||||
#define __PCSP_INPUT_H__
|
||||
|
||||
int __devinit pcspkr_input_init(struct input_dev **rdev, struct device *dev);
|
||||
int pcspkr_input_init(struct input_dev **rdev, struct device *dev);
|
||||
int pcspkr_input_remove(struct input_dev *dev);
|
||||
void pcspkr_stop_sound(void);
|
||||
|
||||
|
@@ -334,7 +334,7 @@ static struct snd_pcm_ops snd_pcsp_playback_ops = {
|
||||
.pointer = snd_pcsp_playback_pointer,
|
||||
};
|
||||
|
||||
int __devinit snd_pcsp_new_pcm(struct snd_pcsp *chip)
|
||||
int snd_pcsp_new_pcm(struct snd_pcsp *chip)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
@@ -119,17 +119,17 @@ static int pcsp_pcspkr_put(struct snd_kcontrol *kcontrol,
|
||||
.put = pcsp_##ctl_type##_put, \
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_pcm[] = {
|
||||
static struct snd_kcontrol_new snd_pcsp_controls_pcm[] = {
|
||||
PCSP_MIXER_CONTROL(enable, "Master Playback Switch"),
|
||||
PCSP_MIXER_CONTROL(treble, "BaseFRQ Playback Volume"),
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = {
|
||||
static struct snd_kcontrol_new snd_pcsp_controls_spkr[] = {
|
||||
PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"),
|
||||
};
|
||||
|
||||
static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,
|
||||
struct snd_kcontrol_new *ctls, int num)
|
||||
static int snd_pcsp_ctls_add(struct snd_pcsp *chip,
|
||||
struct snd_kcontrol_new *ctls, int num)
|
||||
{
|
||||
int i, err;
|
||||
struct snd_card *card = chip->card;
|
||||
@@ -141,7 +141,7 @@ static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm)
|
||||
int snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm)
|
||||
{
|
||||
int err;
|
||||
struct snd_card *card = chip->card;
|
||||
|
新增問題並參考
封鎖使用者