dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Bill Pemberton 2012-12-06 12:35:24 -05:00 committed by Takashi Iwai
parent 15afafc256
commit e74033a858
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/sh/aica.c
View File

@ -540,7 +540,7 @@ static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol,
return 1; 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, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Switch", .name = "PCM Playback Switch",
.index = 0, .index = 0,
@ -549,7 +549,7 @@ static struct snd_kcontrol_new snd_aica_pcmswitch_control __devinitdata = {
.put = aica_pcmswitch_put .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, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PCM Playback Volume", .name = "PCM Playback Volume",
.index = 0, .index = 0,
@ -574,8 +574,7 @@ static int load_aica_firmware(void)
return err; return err;
} }
static int __devinit add_aicamixer_controls(struct snd_card_aica static int add_aicamixer_controls(struct snd_card_aica *dreamcastcard)
*dreamcastcard)
{ {
int err; int err;
err = snd_ctl_add err = snd_ctl_add
@ -591,7 +590,7 @@ static int __devinit add_aicamixer_controls(struct snd_card_aica
return 0; 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; struct snd_card_aica *dreamcastcard;
dreamcastcard = platform_get_drvdata(devptr); dreamcastcard = platform_get_drvdata(devptr);
@ -603,7 +602,7 @@ static int __devexit snd_aica_remove(struct platform_device *devptr)
return 0; return 0;
} }
static int __devinit snd_aica_probe(struct platform_device *devptr) static int snd_aica_probe(struct platform_device *devptr)
{ {
int err; int err;
struct snd_card_aica *dreamcastcard; 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 = { static struct platform_driver snd_aica_driver = {
.probe = snd_aica_probe, .probe = snd_aica_probe,
.remove = __devexit_p(snd_aica_remove), .remove = snd_aica_remove,
.driver = { .driver = {
.name = SND_AICA_DRIVER, .name = SND_AICA_DRIVER,
.owner = THIS_MODULE, .owner = THIS_MODULE,

10
sound/sh/sh_dac_audio.c
View File

@ -261,7 +261,7 @@ static struct snd_pcm_ops snd_sh_dac_pcm_ops = {
.mmap = snd_pcm_lib_mmap_iomem, .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; int err;
struct snd_pcm *pcm; struct snd_pcm *pcm;
@ -346,9 +346,9 @@ static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle)
} }
/* create -- chip-specific constructor for the cards components */ /* 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 platform_device *devptr,
struct snd_sh_dac **rchip) struct snd_sh_dac **rchip)
{ {
struct snd_sh_dac *chip; struct snd_sh_dac *chip;
int err; int err;
@ -392,7 +392,7 @@ static int __devinit snd_sh_dac_create(struct snd_card *card,
} }
/* driver .probe -- constructor */ /* 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_sh_dac *chip;
struct snd_card *card; struct snd_card *card;