aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/dummy.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:27 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:34:32 -0500
commitfbbb01a12d5d553ea3851a020d98c0ac9b383673 (patch)
treec11ff5d8c1c4cac7bd350e2ae7d05bd98ddc82c9 /sound/drivers/dummy.c
parent4423d247509fe65fb9e9efb35229fd1d3986d41d (diff)
ALSA: drivers: 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/drivers/dummy.c')
-rw-r--r--sound/drivers/dummy.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 4f522cf48455..fd798f753609 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -688,8 +688,8 @@ static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
688 .page = dummy_pcm_page, 688 .page = dummy_pcm_page,
689}; 689};
690 690
691static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, 691static int snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
692 int substreams) 692 int substreams)
693{ 693{
694 struct snd_pcm *pcm; 694 struct snd_pcm *pcm;
695 struct snd_pcm_ops *ops; 695 struct snd_pcm_ops *ops;
@@ -891,7 +891,7 @@ DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD),
891}, 891},
892}; 892};
893 893
894static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) 894static int snd_card_dummy_new_mixer(struct snd_dummy *dummy)
895{ 895{
896 struct snd_card *card = dummy->card; 896 struct snd_card *card = dummy->card;
897 struct snd_kcontrol *kcontrol; 897 struct snd_kcontrol *kcontrol;
@@ -1031,7 +1031,7 @@ static void dummy_proc_write(struct snd_info_entry *entry,
1031 } 1031 }
1032} 1032}
1033 1033
1034static void __devinit dummy_proc_init(struct snd_dummy *chip) 1034static void dummy_proc_init(struct snd_dummy *chip)
1035{ 1035{
1036 struct snd_info_entry *entry; 1036 struct snd_info_entry *entry;
1037 1037
@@ -1046,7 +1046,7 @@ static void __devinit dummy_proc_init(struct snd_dummy *chip)
1046#define dummy_proc_init(x) 1046#define dummy_proc_init(x)
1047#endif /* CONFIG_SND_DEBUG && CONFIG_PROC_FS */ 1047#endif /* CONFIG_SND_DEBUG && CONFIG_PROC_FS */
1048 1048
1049static int __devinit snd_dummy_probe(struct platform_device *devptr) 1049static int snd_dummy_probe(struct platform_device *devptr)
1050{ 1050{
1051 struct snd_card *card; 1051 struct snd_card *card;
1052 struct snd_dummy *dummy; 1052 struct snd_dummy *dummy;
@@ -1126,7 +1126,7 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
1126 return err; 1126 return err;
1127} 1127}
1128 1128
1129static int __devexit snd_dummy_remove(struct platform_device *devptr) 1129static int snd_dummy_remove(struct platform_device *devptr)
1130{ 1130{
1131 snd_card_free(platform_get_drvdata(devptr)); 1131 snd_card_free(platform_get_drvdata(devptr));
1132 platform_set_drvdata(devptr, NULL); 1132 platform_set_drvdata(devptr, NULL);
@@ -1162,7 +1162,7 @@ static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);
1162 1162
1163static struct platform_driver snd_dummy_driver = { 1163static struct platform_driver snd_dummy_driver = {
1164 .probe = snd_dummy_probe, 1164 .probe = snd_dummy_probe,
1165 .remove = __devexit_p(snd_dummy_remove), 1165 .remove = snd_dummy_remove,
1166 .driver = { 1166 .driver = {
1167 .name = SND_DUMMY_DRIVER, 1167 .name = SND_DUMMY_DRIVER,
1168 .owner = THIS_MODULE, 1168 .owner = THIS_MODULE,