mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
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>
This commit is contained in:
Bill Pemberton
Takashi Iwai
parent
4423d24750
commit
fbbb01a12d
@ -774,8 +774,8 @@ static struct snd_pcm_ops loopback_capture_ops = {
|
||||
.mmap = snd_pcm_lib_mmap_vmalloc,
|
||||
};
|
||||
|
||||
static int __devinit loopback_pcm_new(struct loopback *loopback,
|
||||
int device, int substreams)
|
||||
static int loopback_pcm_new(struct loopback *loopback,
|
||||
int device, int substreams)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
int err;
|
||||
@ -949,7 +949,7 @@ static int loopback_channels_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new loopback_controls[] __devinitdata = {
|
||||
static struct snd_kcontrol_new loopback_controls[] = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = "PCM Rate Shift 100000",
|
||||
@ -998,7 +998,7 @@ static struct snd_kcontrol_new loopback_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)
|
||||
static int loopback_mixer_new(struct loopback *loopback, int notify)
|
||||
{
|
||||
struct snd_card *card = loopback->card;
|
||||
struct snd_pcm *pcm;
|
||||
@ -1111,7 +1111,7 @@ static void print_cable_info(struct snd_info_entry *entry,
|
||||
mutex_unlock(&loopback->cable_lock);
|
||||
}
|
||||
|
||||
static int __devinit loopback_proc_new(struct loopback *loopback, int cidx)
|
||||
static int loopback_proc_new(struct loopback *loopback, int cidx)
|
||||
{
|
||||
char name[32];
|
||||
struct snd_info_entry *entry;
|
||||
@ -1132,7 +1132,7 @@ static int __devinit loopback_proc_new(struct loopback *loopback, int cidx)
|
||||
|
||||
#endif
|
||||
|
||||
static int __devinit loopback_probe(struct platform_device *devptr)
|
||||
static int loopback_probe(struct platform_device *devptr)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct loopback *loopback;
|
||||
@ -1177,7 +1177,7 @@ static int __devinit loopback_probe(struct platform_device *devptr)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit loopback_remove(struct platform_device *devptr)
|
||||
static int loopback_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -1215,7 +1215,7 @@ static SIMPLE_DEV_PM_OPS(loopback_pm, loopback_suspend, loopback_resume);
|
||||
|
||||
static struct platform_driver loopback_driver = {
|
||||
.probe = loopback_probe,
|
||||
.remove = __devexit_p(loopback_remove),
|
||||
.remove = loopback_remove,
|
||||
.driver = {
|
||||
.name = SND_LOOPBACK_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -688,8 +688,8 @@ static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
|
||||
.page = dummy_pcm_page,
|
||||
};
|
||||
|
||||
static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
|
||||
int substreams)
|
||||
static int snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
|
||||
int substreams)
|
||||
{
|
||||
struct snd_pcm *pcm;
|
||||
struct snd_pcm_ops *ops;
|
||||
@ -891,7 +891,7 @@ DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD),
|
||||
},
|
||||
};
|
||||
|
||||
static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
|
||||
static int snd_card_dummy_new_mixer(struct snd_dummy *dummy)
|
||||
{
|
||||
struct snd_card *card = dummy->card;
|
||||
struct snd_kcontrol *kcontrol;
|
||||
@ -1031,7 +1031,7 @@ static void dummy_proc_write(struct snd_info_entry *entry,
|
||||
}
|
||||
}
|
||||
|
||||
static void __devinit dummy_proc_init(struct snd_dummy *chip)
|
||||
static void dummy_proc_init(struct snd_dummy *chip)
|
||||
{
|
||||
struct snd_info_entry *entry;
|
||||
|
||||
@ -1046,7 +1046,7 @@ static void __devinit dummy_proc_init(struct snd_dummy *chip)
|
||||
#define dummy_proc_init(x)
|
||||
#endif /* CONFIG_SND_DEBUG && CONFIG_PROC_FS */
|
||||
|
||||
static int __devinit snd_dummy_probe(struct platform_device *devptr)
|
||||
static int snd_dummy_probe(struct platform_device *devptr)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_dummy *dummy;
|
||||
@ -1126,7 +1126,7 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_dummy_remove(struct platform_device *devptr)
|
||||
static int snd_dummy_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -1162,7 +1162,7 @@ static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);
|
||||
|
||||
static struct platform_driver snd_dummy_driver = {
|
||||
.probe = snd_dummy_probe,
|
||||
.remove = __devexit_p(snd_dummy_remove),
|
||||
.remove = snd_dummy_remove,
|
||||
.driver = {
|
||||
.name = SND_DUMMY_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -1063,7 +1063,7 @@ snd_ml403_ac97cr_codec_write(struct snd_ac97 *ac97, unsigned short reg,
|
||||
return;
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
snd_ml403_ac97cr_chip_init(struct snd_ml403_ac97cr *ml403_ac97cr)
|
||||
{
|
||||
unsigned long end_time;
|
||||
@ -1108,7 +1108,7 @@ static int snd_ml403_ac97cr_dev_free(struct snd_device *snddev)
|
||||
return snd_ml403_ac97cr_free(ml403_ac97cr);
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
|
||||
struct snd_ml403_ac97cr **rml403_ac97cr)
|
||||
{
|
||||
@ -1204,7 +1204,7 @@ static void snd_ml403_ac97cr_mixer_free(struct snd_ac97 *ac97)
|
||||
PDEBUG(INIT_INFO, "mixer_free(): (done)\n");
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
snd_ml403_ac97cr_mixer(struct snd_ml403_ac97cr *ml403_ac97cr)
|
||||
{
|
||||
struct snd_ac97_bus *bus;
|
||||
@ -1237,7 +1237,7 @@ snd_ml403_ac97cr_mixer(struct snd_ml403_ac97cr *ml403_ac97cr)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit
|
||||
static int
|
||||
snd_ml403_ac97cr_pcm(struct snd_ml403_ac97cr *ml403_ac97cr, int device,
|
||||
struct snd_pcm **rpcm)
|
||||
{
|
||||
@ -1268,7 +1268,7 @@ snd_ml403_ac97cr_pcm(struct snd_ml403_ac97cr *ml403_ac97cr, int device,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_ml403_ac97cr_probe(struct platform_device *pfdev)
|
||||
static int snd_ml403_ac97cr_probe(struct platform_device *pfdev)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_ml403_ac97cr *ml403_ac97cr = NULL;
|
||||
|
||||
@ -100,7 +100,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit snd_mpu401_probe(struct platform_device *devptr)
|
||||
static int snd_mpu401_probe(struct platform_device *devptr)
|
||||
{
|
||||
int dev = devptr->id;
|
||||
int err;
|
||||
@ -126,7 +126,7 @@ static int __devinit snd_mpu401_probe(struct platform_device *devptr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit snd_mpu401_remove(struct platform_device *devptr)
|
||||
static int snd_mpu401_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -137,7 +137,7 @@ static int __devexit snd_mpu401_remove(struct platform_device *devptr)
|
||||
|
||||
static struct platform_driver snd_mpu401_driver = {
|
||||
.probe = snd_mpu401_probe,
|
||||
.remove = __devexit_p(snd_mpu401_remove),
|
||||
.remove = snd_mpu401_remove,
|
||||
.driver = {
|
||||
.name = SND_MPU401_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
@ -156,8 +156,8 @@ static struct pnp_device_id snd_mpu401_pnpids[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
|
||||
|
||||
static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
const struct pnp_device_id *id)
|
||||
static int snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
const struct pnp_device_id *id)
|
||||
{
|
||||
if (!pnp_port_valid(device, 0) ||
|
||||
pnp_port_flags(device, 0) & IORESOURCE_DISABLED) {
|
||||
@ -182,8 +182,8 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
const struct pnp_device_id *id)
|
||||
static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
const struct pnp_device_id *id)
|
||||
{
|
||||
static int dev;
|
||||
struct snd_card *card;
|
||||
@ -211,7 +211,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
|
||||
static void snd_mpu401_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
|
||||
|
||||
@ -223,7 +223,7 @@ static struct pnp_driver snd_mpu401_pnp_driver = {
|
||||
.name = "mpu401",
|
||||
.id_table = snd_mpu401_pnpids,
|
||||
.probe = snd_mpu401_pnp_probe,
|
||||
.remove = __devexit_p(snd_mpu401_pnp_remove),
|
||||
.remove = snd_mpu401_pnp_remove,
|
||||
};
|
||||
#else
|
||||
static struct pnp_driver snd_mpu401_pnp_driver;
|
||||
|
||||
@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
|
||||
/*
|
||||
* get ISA resources
|
||||
*/
|
||||
static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
|
||||
static int snd_mtpav_get_ISA(struct mtpav *mcard)
|
||||
{
|
||||
if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
|
||||
snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);
|
||||
@ -619,8 +619,8 @@ static struct snd_rawmidi_ops snd_mtpav_input = {
|
||||
* get RAWMIDI resources
|
||||
*/
|
||||
|
||||
static void __devinit snd_mtpav_set_name(struct mtpav *chip,
|
||||
struct snd_rawmidi_substream *substream)
|
||||
static void snd_mtpav_set_name(struct mtpav *chip,
|
||||
struct snd_rawmidi_substream *substream)
|
||||
{
|
||||
if (substream->number >= 0 && substream->number < chip->num_ports)
|
||||
sprintf(substream->name, "MTP direct %d", (substream->number % chip->num_ports) + 1);
|
||||
@ -634,7 +634,7 @@ static void __devinit snd_mtpav_set_name(struct mtpav *chip,
|
||||
strcpy(substream->name, "MTP broadcast");
|
||||
}
|
||||
|
||||
static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)
|
||||
static int snd_mtpav_get_RAWMIDI(struct mtpav *mcard)
|
||||
{
|
||||
int rval;
|
||||
struct snd_rawmidi *rawmidi;
|
||||
@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card)
|
||||
|
||||
/*
|
||||
*/
|
||||
static int __devinit snd_mtpav_probe(struct platform_device *dev)
|
||||
static int snd_mtpav_probe(struct platform_device *dev)
|
||||
{
|
||||
struct snd_card *card;
|
||||
int err;
|
||||
@ -746,7 +746,7 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_mtpav_remove(struct platform_device *devptr)
|
||||
static int snd_mtpav_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -757,7 +757,7 @@ static int __devexit snd_mtpav_remove(struct platform_device *devptr)
|
||||
|
||||
static struct platform_driver snd_mtpav_driver = {
|
||||
.probe = snd_mtpav_probe,
|
||||
.remove = __devexit_p(snd_mtpav_remove),
|
||||
.remove = snd_mtpav_remove,
|
||||
.driver = {
|
||||
.name = SND_MTPAV_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -83,9 +83,9 @@ static int snd_mts64_free(struct mts64 *mts)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_mts64_create(struct snd_card *card,
|
||||
struct pardevice *pardev,
|
||||
struct mts64 **rchip)
|
||||
static int snd_mts64_create(struct snd_card *card,
|
||||
struct pardevice *pardev,
|
||||
struct mts64 **rchip)
|
||||
{
|
||||
struct mts64 *mts;
|
||||
|
||||
@ -214,7 +214,7 @@ static int mts64_device_ready(struct parport *p)
|
||||
* 0 init ok
|
||||
* -EIO failure
|
||||
*/
|
||||
static int __devinit mts64_device_init(struct parport *p)
|
||||
static int mts64_device_init(struct parport *p)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -290,7 +290,7 @@ static u8 mts64_map_midi_input(u8 c)
|
||||
* 0 device found
|
||||
* -ENODEV no device
|
||||
*/
|
||||
static int __devinit mts64_probe(struct parport *p)
|
||||
static int mts64_probe(struct parport *p)
|
||||
{
|
||||
u8 c;
|
||||
|
||||
@ -483,7 +483,7 @@ __out:
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_switch __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_switch = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Playback Switch",
|
||||
.index = 0,
|
||||
@ -556,7 +556,7 @@ static int snd_mts64_ctl_smpte_time_put(struct snd_kcontrol *kctl,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_hours __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_hours = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Time Hours",
|
||||
.index = 0,
|
||||
@ -567,7 +567,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_hours __devinitdata = {
|
||||
.put = snd_mts64_ctl_smpte_time_put
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_minutes __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_minutes = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Time Minutes",
|
||||
.index = 0,
|
||||
@ -578,7 +578,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_minutes __devinitdata = {
|
||||
.put = snd_mts64_ctl_smpte_time_put
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_seconds __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_seconds = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Time Seconds",
|
||||
.index = 0,
|
||||
@ -589,7 +589,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_seconds __devinitdata = {
|
||||
.put = snd_mts64_ctl_smpte_time_put
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_frames __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_time_frames = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Time Frames",
|
||||
.index = 0,
|
||||
@ -651,7 +651,7 @@ static int snd_mts64_ctl_smpte_fps_put(struct snd_kcontrol *kctl,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_fps __devinitdata = {
|
||||
static struct snd_kcontrol_new mts64_ctl_smpte_fps = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,
|
||||
.name = "SMPTE Fps",
|
||||
.index = 0,
|
||||
@ -663,11 +663,11 @@ static struct snd_kcontrol_new mts64_ctl_smpte_fps __devinitdata = {
|
||||
};
|
||||
|
||||
|
||||
static int __devinit snd_mts64_ctl_create(struct snd_card *card,
|
||||
struct mts64 *mts)
|
||||
static int snd_mts64_ctl_create(struct snd_card *card,
|
||||
struct mts64 *mts)
|
||||
{
|
||||
int err, i;
|
||||
static struct snd_kcontrol_new *control[] __devinitdata = {
|
||||
static struct snd_kcontrol_new *control[] = {
|
||||
&mts64_ctl_smpte_switch,
|
||||
&mts64_ctl_smpte_time_hours,
|
||||
&mts64_ctl_smpte_time_minutes,
|
||||
@ -774,7 +774,7 @@ static struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = {
|
||||
};
|
||||
|
||||
/* Create and initialize the rawmidi component */
|
||||
static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)
|
||||
static int snd_mts64_rawmidi_create(struct snd_card *card)
|
||||
{
|
||||
struct mts64 *mts = card->private_data;
|
||||
struct snd_rawmidi *rmidi;
|
||||
@ -860,7 +860,7 @@ __out:
|
||||
spin_unlock(&mts->lock);
|
||||
}
|
||||
|
||||
static int __devinit snd_mts64_probe_port(struct parport *p)
|
||||
static int snd_mts64_probe_port(struct parport *p)
|
||||
{
|
||||
struct pardevice *pardev;
|
||||
int res;
|
||||
@ -884,7 +884,7 @@ static int __devinit snd_mts64_probe_port(struct parport *p)
|
||||
return res;
|
||||
}
|
||||
|
||||
static void __devinit snd_mts64_attach(struct parport *p)
|
||||
static void snd_mts64_attach(struct parport *p)
|
||||
{
|
||||
struct platform_device *device;
|
||||
|
||||
@ -940,7 +940,7 @@ static void snd_mts64_card_private_free(struct snd_card *card)
|
||||
snd_mts64_free(mts);
|
||||
}
|
||||
|
||||
static int __devinit snd_mts64_probe(struct platform_device *pdev)
|
||||
static int snd_mts64_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct pardevice *pardev;
|
||||
struct parport *p;
|
||||
@ -1025,7 +1025,7 @@ __err:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_mts64_remove(struct platform_device *pdev)
|
||||
static int snd_mts64_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
@ -1038,7 +1038,7 @@ static int __devexit snd_mts64_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver snd_mts64_driver = {
|
||||
.probe = snd_mts64_probe,
|
||||
.remove = __devexit_p(snd_mts64_remove),
|
||||
.remove = snd_mts64_remove,
|
||||
.driver = {
|
||||
.name = PLATFORM_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -96,9 +96,9 @@ static int portman_free(struct portman *pm)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit portman_create(struct snd_card *card,
|
||||
struct pardevice *pardev,
|
||||
struct portman **rchip)
|
||||
static int portman_create(struct snd_card *card,
|
||||
struct pardevice *pardev,
|
||||
struct portman **rchip)
|
||||
{
|
||||
struct portman *pm;
|
||||
|
||||
@ -561,7 +561,7 @@ static struct snd_rawmidi_ops snd_portman_midi_input = {
|
||||
};
|
||||
|
||||
/* Create and initialize the rawmidi component */
|
||||
static int __devinit snd_portman_rawmidi_create(struct snd_card *card)
|
||||
static int snd_portman_rawmidi_create(struct snd_card *card)
|
||||
{
|
||||
struct portman *pm = card->private_data;
|
||||
struct snd_rawmidi *rmidi;
|
||||
@ -648,7 +648,7 @@ static void snd_portman_interrupt(void *userdata)
|
||||
spin_unlock(&pm->reg_lock);
|
||||
}
|
||||
|
||||
static int __devinit snd_portman_probe_port(struct parport *p)
|
||||
static int snd_portman_probe_port(struct parport *p)
|
||||
{
|
||||
struct pardevice *pardev;
|
||||
int res;
|
||||
@ -672,7 +672,7 @@ static int __devinit snd_portman_probe_port(struct parport *p)
|
||||
return res ? -EIO : 0;
|
||||
}
|
||||
|
||||
static void __devinit snd_portman_attach(struct parport *p)
|
||||
static void snd_portman_attach(struct parport *p)
|
||||
{
|
||||
struct platform_device *device;
|
||||
|
||||
@ -728,7 +728,7 @@ static void snd_portman_card_private_free(struct snd_card *card)
|
||||
portman_free(pm);
|
||||
}
|
||||
|
||||
static int __devinit snd_portman_probe(struct platform_device *pdev)
|
||||
static int snd_portman_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct pardevice *pardev;
|
||||
struct parport *p;
|
||||
@ -814,7 +814,7 @@ __err:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_portman_remove(struct platform_device *pdev)
|
||||
static int snd_portman_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
@ -827,7 +827,7 @@ static int __devexit snd_portman_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver snd_portman_driver = {
|
||||
.probe = snd_portman_probe,
|
||||
.remove = __devexit_p(snd_portman_remove),
|
||||
.remove = snd_portman_remove,
|
||||
.driver = {
|
||||
.name = PLATFORM_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -328,7 +328,7 @@ static void snd_uart16550_buffer_timer(unsigned long data)
|
||||
* return 0 if found
|
||||
* return negative error if not found
|
||||
*/
|
||||
static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart)
|
||||
static int snd_uart16550_detect(struct snd_uart16550 *uart)
|
||||
{
|
||||
unsigned long io_base = uart->base;
|
||||
int ok;
|
||||
@ -783,14 +783,14 @@ static int snd_uart16550_dev_free(struct snd_device *device)
|
||||
return snd_uart16550_free(uart);
|
||||
}
|
||||
|
||||
static int __devinit snd_uart16550_create(struct snd_card *card,
|
||||
unsigned long iobase,
|
||||
int irq,
|
||||
unsigned int speed,
|
||||
unsigned int base,
|
||||
int adaptor,
|
||||
int droponfull,
|
||||
struct snd_uart16550 **ruart)
|
||||
static int snd_uart16550_create(struct snd_card *card,
|
||||
unsigned long iobase,
|
||||
int irq,
|
||||
unsigned int speed,
|
||||
unsigned int base,
|
||||
int adaptor,
|
||||
int droponfull,
|
||||
struct snd_uart16550 **ruart)
|
||||
{
|
||||
static struct snd_device_ops ops = {
|
||||
.dev_free = snd_uart16550_dev_free,
|
||||
@ -863,7 +863,7 @@ static int __devinit snd_uart16550_create(struct snd_card *card,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)
|
||||
static void snd_uart16550_substreams(struct snd_rawmidi_str *stream)
|
||||
{
|
||||
struct snd_rawmidi_substream *substream;
|
||||
|
||||
@ -872,9 +872,9 @@ static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)
|
||||
}
|
||||
}
|
||||
|
||||
static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
|
||||
int outs, int ins,
|
||||
struct snd_rawmidi **rmidi)
|
||||
static int snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
|
||||
int outs, int ins,
|
||||
struct snd_rawmidi **rmidi)
|
||||
{
|
||||
struct snd_rawmidi *rrawmidi;
|
||||
int err;
|
||||
@ -899,7 +899,7 @@ static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit snd_serial_probe(struct platform_device *devptr)
|
||||
static int snd_serial_probe(struct platform_device *devptr)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_uart16550 *uart;
|
||||
@ -982,7 +982,7 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_serial_remove(struct platform_device *devptr)
|
||||
static int snd_serial_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -993,7 +993,7 @@ static int __devexit snd_serial_remove(struct platform_device *devptr)
|
||||
|
||||
static struct platform_driver snd_serial_driver = {
|
||||
.probe = snd_serial_probe,
|
||||
.remove = __devexit_p( snd_serial_remove),
|
||||
.remove = snd_serial_remove,
|
||||
.driver = {
|
||||
.name = SND_SERIAL_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@ -83,7 +83,7 @@ struct snd_card_virmidi {
|
||||
static struct platform_device *devices[SNDRV_CARDS];
|
||||
|
||||
|
||||
static int __devinit snd_virmidi_probe(struct platform_device *devptr)
|
||||
static int snd_virmidi_probe(struct platform_device *devptr)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_card_virmidi *vmidi;
|
||||
@ -129,7 +129,7 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devexit snd_virmidi_remove(struct platform_device *devptr)
|
||||
static int snd_virmidi_remove(struct platform_device *devptr)
|
||||
{
|
||||
snd_card_free(platform_get_drvdata(devptr));
|
||||
platform_set_drvdata(devptr, NULL);
|
||||
@ -140,7 +140,7 @@ static int __devexit snd_virmidi_remove(struct platform_device *devptr)
|
||||
|
||||
static struct platform_driver snd_virmidi_driver = {
|
||||
.probe = snd_virmidi_probe,
|
||||
.remove = __devexit_p(snd_virmidi_remove),
|
||||
.remove = snd_virmidi_remove,
|
||||
.driver = {
|
||||
.name = SND_VIRMIDI_DRIVER,
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user