Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bill Pemberton and committed by
Takashi Iwai
e0f8cb5f 325fbfe0

+23 -23
+2 -2
sound/mips/au1x00.c
··· 439 439 .pointer = snd_au1000_pointer, 440 440 }; 441 441 442 - static int __devinit 442 + static int 443 443 snd_au1000_pcm_new(struct snd_au1000 *au1000) 444 444 { 445 445 struct snd_pcm *pcm; ··· 552 552 spin_unlock(&au1000->ac97_lock); 553 553 } 554 554 555 - static int __devinit 555 + static int 556 556 snd_au1000_ac97_new(struct snd_au1000 *au1000) 557 557 { 558 558 int err;
+7 -7
sound/mips/hal2.c
··· 260 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 264 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 265 265 .name = "Headphone Playback Volume", 266 266 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, ··· 270 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 274 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 275 275 .name = "Mic Capture Volume", 276 276 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, ··· 280 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 285 int err; 286 286 ··· 733 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 738 struct snd_pcm *pcm; 739 739 int err; ··· 874 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 879 struct snd_card *card; 880 880 struct snd_hal2 *chip; ··· 917 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 922 struct snd_card *card = platform_get_drvdata(pdev); 923 923 ··· 928 928 929 929 static struct platform_driver hal2_driver = { 930 930 .probe = hal2_probe, 931 - .remove = __devexit_p(hal2_remove), 931 + .remove = hal2_remove, 932 932 .driver = { 933 933 .name = "sgihal2", 934 934 .owner = THIS_MODULE,
+14 -14
sound/mips/sgio2audio.c
··· 237 237 } 238 238 239 239 /* dac1/pcm0 mixer control */ 240 - static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = { 240 + static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = { 241 241 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 242 242 .name = "PCM Playback Volume", 243 243 .index = 0, ··· 249 249 }; 250 250 251 251 /* dac2/pcm1 mixer control */ 252 - static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = { 252 + static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = { 253 253 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 254 254 .name = "PCM Playback Volume", 255 255 .index = 1, ··· 261 261 }; 262 262 263 263 /* record level mixer control */ 264 - static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = { 264 + static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = { 265 265 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 266 266 .name = "Capture Volume", 267 267 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, ··· 272 272 }; 273 273 274 274 /* record level source control */ 275 - static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = { 275 + static struct snd_kcontrol_new sgio2audio_ctrl_recsource = { 276 276 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 277 277 .name = "Capture Source", 278 278 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, ··· 282 282 }; 283 283 284 284 /* line mixer control */ 285 - static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = { 285 + static struct snd_kcontrol_new sgio2audio_ctrl_line = { 286 286 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 287 287 .name = "Line Playback Volume", 288 288 .index = 0, ··· 294 294 }; 295 295 296 296 /* cd mixer control */ 297 - static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = { 297 + static struct snd_kcontrol_new sgio2audio_ctrl_cd = { 298 298 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 299 299 .name = "Line Playback Volume", 300 300 .index = 1, ··· 306 306 }; 307 307 308 308 /* mic mixer control */ 309 - static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = { 309 + static struct snd_kcontrol_new sgio2audio_ctrl_mic = { 310 310 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 311 311 .name = "Mic Playback Volume", 312 312 .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, ··· 317 317 }; 318 318 319 319 320 - static int __devinit snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip) 320 + static int snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip) 321 321 { 322 322 int err; 323 323 ··· 726 726 */ 727 727 728 728 /* create a pcm device */ 729 - static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip) 729 + static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip) 730 730 { 731 731 struct snd_pcm *pcm; 732 732 int err; ··· 834 834 .dev_free = snd_sgio2audio_dev_free, 835 835 }; 836 836 837 - static int __devinit snd_sgio2audio_create(struct snd_card *card, 838 - struct snd_sgio2audio **rchip) 837 + static int snd_sgio2audio_create(struct snd_card *card, 838 + struct snd_sgio2audio **rchip) 839 839 { 840 840 struct snd_sgio2audio *chip; 841 841 int i, err; ··· 914 914 return 0; 915 915 } 916 916 917 - static int __devinit snd_sgio2audio_probe(struct platform_device *pdev) 917 + static int snd_sgio2audio_probe(struct platform_device *pdev) 918 918 { 919 919 struct snd_card *card; 920 920 struct snd_sgio2audio *chip; ··· 958 958 return 0; 959 959 } 960 960 961 - static int __devexit snd_sgio2audio_remove(struct platform_device *pdev) 961 + static int snd_sgio2audio_remove(struct platform_device *pdev) 962 962 { 963 963 struct snd_card *card = platform_get_drvdata(pdev); 964 964 ··· 969 969 970 970 static struct platform_driver sgio2audio_driver = { 971 971 .probe = snd_sgio2audio_probe, 972 - .remove = __devexit_p(snd_sgio2audio_remove), 972 + .remove = snd_sgio2audio_remove, 973 973 .driver = { 974 974 .name = "sgio2audio", 975 975 .owner = THIS_MODULE,