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

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

ALSA: sh: 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 15afafc2

sound/sh/aica.c

+6 −7
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static struct snd_kcontrol_new snd_aica_pcmswitch_control __devinitdata = {

static struct snd_kcontrol_new snd_aica_pcmswitch_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PCM Playback Switch",

	.index = 0,
@@ -549,7 +549,7 @@ static struct snd_kcontrol_new snd_aica_pcmswitch_control __devinitdata = { 
	.put = aica_pcmswitch_put

};



static struct snd_kcontrol_new snd_aica_pcmvolume_control __devinitdata = {

static struct snd_kcontrol_new snd_aica_pcmvolume_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PCM Playback Volume",

	.index = 0,
@@ -574,8 +574,7 @@ static int load_aica_firmware(void) 
	return err;

}



static int __devinit add_aicamixer_controls(struct snd_card_aica

					    *dreamcastcard)

static int add_aicamixer_controls(struct snd_card_aica *dreamcastcard)

{

	int err;

	err = snd_ctl_add
@@ -591,7 +590,7 @@ static int __devinit add_aicamixer_controls(struct snd_card_aica 
	return 0;

}



static int __devexit snd_aica_remove(struct platform_device *devptr)

static int snd_aica_remove(struct platform_device *devptr)

{

	struct snd_card_aica *dreamcastcard;

	dreamcastcard = platform_get_drvdata(devptr);
@@ -603,7 +602,7 @@ static int __devexit snd_aica_remove(struct platform_device *devptr) 
	return 0;

}



static int __devinit snd_aica_probe(struct platform_device *devptr)

static int snd_aica_probe(struct platform_device *devptr)

{

	int err;

	struct snd_card_aica *dreamcastcard;
@@ -652,7 +651,7 @@ static int __devinit snd_aica_probe(struct platform_device *devptr) 


static struct platform_driver snd_aica_driver = {

	.probe = snd_aica_probe,

	.remove = __devexit_p(snd_aica_remove),

	.remove = snd_aica_remove,

	.driver = {

		.name = SND_AICA_DRIVER,

		.owner	= THIS_MODULE,

sound/sh/sh_dac_audio.c

+5 −5
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static struct snd_pcm_ops snd_sh_dac_pcm_ops = { 
	.mmap		= snd_pcm_lib_mmap_iomem,

};



static int __devinit snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)

static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)

{

	int err;

	struct snd_pcm *pcm;
@@ -346,7 +346,7 @@ static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle) 
}



/* create  --  chip-specific constructor for the cards components */

static int __devinit snd_sh_dac_create(struct snd_card *card,

static int snd_sh_dac_create(struct snd_card *card,

			     struct platform_device *devptr,

			     struct snd_sh_dac **rchip)

{
@@ -392,7 +392,7 @@ static int __devinit snd_sh_dac_create(struct snd_card *card, 
}



/* driver .probe  --  constructor */

static int __devinit snd_sh_dac_probe(struct platform_device *devptr)

static int snd_sh_dac_probe(struct platform_device *devptr)

{

	struct snd_sh_dac *chip;

	struct snd_card *card;