From e74033a858bf36d5763eafea600e07fc917e3592 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 6 Dec 2012 12:35:24 -0500 Subject: 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 Signed-off-by: Takashi Iwai --- sound/sh/aica.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sound/sh/aica.c') diff --git a/sound/sh/aica.c b/sound/sh/aica.c index d48b523207eb..e59a73a9bc42 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -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, -- cgit v1.2.3-59-g8ed1b