diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:29:45 -0500 |
commit | e0f8cb5fac7f6ab0353caccab54e960bbe517123 (patch) | |
tree | a78110396bdc025e9afb341b62c8cdb3c09565e0 /sound/mips/hal2.c | |
parent | 325fbfe0904eb78007b3c319a73f277b7222116f (diff) |
ALSA: mips: 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>
Diffstat (limited to 'sound/mips/hal2.c')
-rw-r--r-- | sound/mips/hal2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 5f88d1f09ffe..7420c59444ab 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
@@ -260,7 +260,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, | |||
260 | return old != new; | 260 | return old != new; |
261 | } | 261 | } |
262 | 262 | ||
263 | static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = { | 263 | static struct snd_kcontrol_new hal2_ctrl_headphone = { |
264 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 264 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
265 | .name = "Headphone Playback Volume", | 265 | .name = "Headphone Playback Volume", |
266 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 266 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -270,7 +270,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = { | |||
270 | .put = hal2_gain_put, | 270 | .put = hal2_gain_put, |
271 | }; | 271 | }; |
272 | 272 | ||
273 | static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = { | 273 | static struct snd_kcontrol_new hal2_ctrl_mic = { |
274 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 274 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
275 | .name = "Mic Capture Volume", | 275 | .name = "Mic Capture Volume", |
276 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 276 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -280,7 +280,7 @@ static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = { | |||
280 | .put = hal2_gain_put, | 280 | .put = hal2_gain_put, |
281 | }; | 281 | }; |
282 | 282 | ||
283 | static int __devinit hal2_mixer_create(struct snd_hal2 *hal2) | 283 | static int hal2_mixer_create(struct snd_hal2 *hal2) |
284 | { | 284 | { |
285 | int err; | 285 | int err; |
286 | 286 | ||
@@ -733,7 +733,7 @@ static struct snd_pcm_ops hal2_capture_ops = { | |||
733 | .ack = hal2_capture_ack, | 733 | .ack = hal2_capture_ack, |
734 | }; | 734 | }; |
735 | 735 | ||
736 | static int __devinit hal2_pcm_create(struct snd_hal2 *hal2) | 736 | static int hal2_pcm_create(struct snd_hal2 *hal2) |
737 | { | 737 | { |
738 | struct snd_pcm *pcm; | 738 | struct snd_pcm *pcm; |
739 | int err; | 739 | int err; |
@@ -874,7 +874,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip) | |||
874 | return 0; | 874 | return 0; |
875 | } | 875 | } |
876 | 876 | ||
877 | static int __devinit hal2_probe(struct platform_device *pdev) | 877 | static int hal2_probe(struct platform_device *pdev) |
878 | { | 878 | { |
879 | struct snd_card *card; | 879 | struct snd_card *card; |
880 | struct snd_hal2 *chip; | 880 | struct snd_hal2 *chip; |
@@ -917,7 +917,7 @@ static int __devinit hal2_probe(struct platform_device *pdev) | |||
917 | return 0; | 917 | return 0; |
918 | } | 918 | } |
919 | 919 | ||
920 | static int __devexit hal2_remove(struct platform_device *pdev) | 920 | static int hal2_remove(struct platform_device *pdev) |
921 | { | 921 | { |
922 | struct snd_card *card = platform_get_drvdata(pdev); | 922 | struct snd_card *card = platform_get_drvdata(pdev); |
923 | 923 | ||
@@ -928,7 +928,7 @@ static int __devexit hal2_remove(struct platform_device *pdev) | |||
928 | 928 | ||
929 | static struct platform_driver hal2_driver = { | 929 | static struct platform_driver hal2_driver = { |
930 | .probe = hal2_probe, | 930 | .probe = hal2_probe, |
931 | .remove = __devexit_p(hal2_remove), | 931 | .remove = hal2_remove, |
932 | .driver = { | 932 | .driver = { |
933 | .name = "sgihal2", | 933 | .name = "sgihal2", |
934 | .owner = THIS_MODULE, | 934 | .owner = THIS_MODULE, |