Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbbb01a1 authored by Bill Pemberton's avatar Bill Pemberton Committed by Takashi Iwai
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4423d247

sound/drivers/aloop.c

+8 −8
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static struct snd_pcm_ops loopback_capture_ops = { 
	.mmap =		snd_pcm_lib_mmap_vmalloc,

};



static int __devinit loopback_pcm_new(struct loopback *loopback,

static int loopback_pcm_new(struct loopback *loopback,

			    int device, int substreams)

{

	struct snd_pcm *pcm;
@@ -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,

sound/drivers/dummy.c

+7 −7
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ 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,

static int snd_card_dummy_pcm(struct snd_dummy *dummy, int device,

			      int substreams)

{

	struct snd_pcm *pcm;
@@ -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,

sound/drivers/ml403-ac97cr.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

sound/drivers/mpu401/mpu401.c

+9 −9
Original line number Diff line number Diff line
@@ -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,7 +156,7 @@ 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,

static int snd_mpu401_pnp(int dev, struct pnp_dev *device,

			  const struct pnp_device_id *id)

{

	if (!pnp_port_valid(device, 0) ||
@@ -182,7 +182,7 @@ 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,

static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,

				const struct pnp_device_id *id)

{

	static int dev;
@@ -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;

sound/drivers/mtpav.c

+7 −7
Original line number Diff line number Diff line
@@ -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,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { 
 * get RAWMIDI resources

 */



static void __devinit snd_mtpav_set_name(struct mtpav *chip,

static void snd_mtpav_set_name(struct mtpav *chip,

			       struct snd_rawmidi_substream *substream)

{

	if (substream->number >= 0 && substream->number < chip->num_ports)
@@ -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,