aboutsummaryrefslogtreecommitdiffstats
path: root/sound/parisc
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:16 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:30:11 -0500
commit05bcf50367668b6706a44e89c166c541f2644d04 (patch)
tree4b5d4ffde368e2c5b2d5d908321e59de65deb224 /sound/parisc
parente0f8cb5fac7f6ab0353caccab54e960bbe517123 (diff)
ALSA: parisc/harmony: 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> Cc: linux-parisc@vger.kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/parisc')
-rw-r--r--sound/parisc/harmony.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index f47f9e226b08..0e66ba48d453 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -856,7 +856,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = {
856 HARMONY_GAIN_HE_SHIFT, 1, 0), 856 HARMONY_GAIN_HE_SHIFT, 1, 0),
857}; 857};
858 858
859static void __devinit 859static void
860snd_harmony_mixer_reset(struct snd_harmony *h) 860snd_harmony_mixer_reset(struct snd_harmony *h)
861{ 861{
862 harmony_mute(h); 862 harmony_mute(h);
@@ -865,7 +865,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)
865 harmony_unmute(h); 865 harmony_unmute(h);
866} 866}
867 867
868static int __devinit 868static int
869snd_harmony_mixer_init(struct snd_harmony *h) 869snd_harmony_mixer_init(struct snd_harmony *h)
870{ 870{
871 struct snd_card *card; 871 struct snd_card *card;
@@ -915,7 +915,7 @@ snd_harmony_dev_free(struct snd_device *dev)
915 return snd_harmony_free(h); 915 return snd_harmony_free(h);
916} 916}
917 917
918static int __devinit 918static int
919snd_harmony_create(struct snd_card *card, 919snd_harmony_create(struct snd_card *card,
920 struct parisc_device *padev, 920 struct parisc_device *padev,
921 struct snd_harmony **rchip) 921 struct snd_harmony **rchip)
@@ -972,7 +972,7 @@ free_and_ret:
972 return err; 972 return err;
973} 973}
974 974
975static int __devinit 975static int
976snd_harmony_probe(struct parisc_device *padev) 976snd_harmony_probe(struct parisc_device *padev)
977{ 977{
978 int err; 978 int err;
@@ -1012,7 +1012,7 @@ free_and_ret:
1012 return err; 1012 return err;
1013} 1013}
1014 1014
1015static int __devexit 1015static int
1016snd_harmony_remove(struct parisc_device *padev) 1016snd_harmony_remove(struct parisc_device *padev)
1017{ 1017{
1018 snd_card_free(parisc_get_drvdata(padev)); 1018 snd_card_free(parisc_get_drvdata(padev));
@@ -1024,7 +1024,7 @@ static struct parisc_driver snd_harmony_driver = {
1024 .name = "harmony", 1024 .name = "harmony",
1025 .id_table = snd_harmony_devtable, 1025 .id_table = snd_harmony_devtable,
1026 .probe = snd_harmony_probe, 1026 .probe = snd_harmony_probe,
1027 .remove = __devexit_p(snd_harmony_remove), 1027 .remove = snd_harmony_remove,
1028}; 1028};
1029 1029
1030static int __init 1030static int __init