diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:18 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:31:18 -0500 |
commit | 2f5c1302815c4c5b946a1cf8c6a79152f3dde721 (patch) | |
tree | f213f0ea072688409513bb89372bca5d73131185 /sound/pci | |
parent | 9921041452ef6bd12a47e5b3e324d07e84629e03 (diff) |
ALSA: ad1889: 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: Thibaut Varene <T-Bone@parisc-linux.org>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ad1889.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index e672ff4df2da..ad8a31173939 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -624,7 +624,7 @@ snd_ad1889_interrupt(int irq, void *dev_id) | |||
624 | return IRQ_HANDLED; | 624 | return IRQ_HANDLED; |
625 | } | 625 | } |
626 | 626 | ||
627 | static int __devinit | 627 | static int |
628 | snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm) | 628 | snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm) |
629 | { | 629 | { |
630 | int err; | 630 | int err; |
@@ -747,7 +747,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe | |||
747 | snd_iprintf(buffer, "Resampler samplerate: %u Hz\n", reg); | 747 | snd_iprintf(buffer, "Resampler samplerate: %u Hz\n", reg); |
748 | } | 748 | } |
749 | 749 | ||
750 | static void __devinit | 750 | static void |
751 | snd_ad1889_proc_init(struct snd_ad1889 *chip) | 751 | snd_ad1889_proc_init(struct snd_ad1889 *chip) |
752 | { | 752 | { |
753 | struct snd_info_entry *entry; | 753 | struct snd_info_entry *entry; |
@@ -767,7 +767,7 @@ static struct ac97_quirk ac97_quirks[] = { | |||
767 | { } /* terminator */ | 767 | { } /* terminator */ |
768 | }; | 768 | }; |
769 | 769 | ||
770 | static void __devinit | 770 | static void |
771 | snd_ad1889_ac97_xinit(struct snd_ad1889 *chip) | 771 | snd_ad1889_ac97_xinit(struct snd_ad1889 *chip) |
772 | { | 772 | { |
773 | u16 reg; | 773 | u16 reg; |
@@ -805,7 +805,7 @@ snd_ad1889_ac97_free(struct snd_ac97 *ac97) | |||
805 | chip->ac97 = NULL; | 805 | chip->ac97 = NULL; |
806 | } | 806 | } |
807 | 807 | ||
808 | static int __devinit | 808 | static int |
809 | snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override) | 809 | snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override) |
810 | { | 810 | { |
811 | int err; | 811 | int err; |
@@ -878,7 +878,7 @@ snd_ad1889_dev_free(struct snd_device *device) | |||
878 | return snd_ad1889_free(chip); | 878 | return snd_ad1889_free(chip); |
879 | } | 879 | } |
880 | 880 | ||
881 | static int __devinit | 881 | static int |
882 | snd_ad1889_init(struct snd_ad1889 *chip) | 882 | snd_ad1889_init(struct snd_ad1889 *chip) |
883 | { | 883 | { |
884 | ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */ | 884 | ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */ |
@@ -892,7 +892,7 @@ snd_ad1889_init(struct snd_ad1889 *chip) | |||
892 | return 0; | 892 | return 0; |
893 | } | 893 | } |
894 | 894 | ||
895 | static int __devinit | 895 | static int |
896 | snd_ad1889_create(struct snd_card *card, | 896 | snd_ad1889_create(struct snd_card *card, |
897 | struct pci_dev *pci, | 897 | struct pci_dev *pci, |
898 | struct snd_ad1889 **rchip) | 898 | struct snd_ad1889 **rchip) |
@@ -978,7 +978,7 @@ free_and_ret: | |||
978 | return err; | 978 | return err; |
979 | } | 979 | } |
980 | 980 | ||
981 | static int __devinit | 981 | static int |
982 | snd_ad1889_probe(struct pci_dev *pci, | 982 | snd_ad1889_probe(struct pci_dev *pci, |
983 | const struct pci_device_id *pci_id) | 983 | const struct pci_device_id *pci_id) |
984 | { | 984 | { |
@@ -1042,7 +1042,7 @@ free_and_ret: | |||
1042 | return err; | 1042 | return err; |
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | static void __devexit | 1045 | static void |
1046 | snd_ad1889_remove(struct pci_dev *pci) | 1046 | snd_ad1889_remove(struct pci_dev *pci) |
1047 | { | 1047 | { |
1048 | snd_card_free(pci_get_drvdata(pci)); | 1048 | snd_card_free(pci_get_drvdata(pci)); |
@@ -1059,7 +1059,7 @@ static struct pci_driver ad1889_pci_driver = { | |||
1059 | .name = KBUILD_MODNAME, | 1059 | .name = KBUILD_MODNAME, |
1060 | .id_table = snd_ad1889_ids, | 1060 | .id_table = snd_ad1889_ids, |
1061 | .probe = snd_ad1889_probe, | 1061 | .probe = snd_ad1889_probe, |
1062 | .remove = __devexit_p(snd_ad1889_remove), | 1062 | .remove = snd_ad1889_remove, |
1063 | }; | 1063 | }; |
1064 | 1064 | ||
1065 | module_pci_driver(ad1889_pci_driver); | 1065 | module_pci_driver(ad1889_pci_driver); |