diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:20 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:32:02 -0500 |
commit | f120a6fb486c2500c9ae11fd2da11fbde29bc186 (patch) | |
tree | f5305274e640bc47eaed0a8ce0091c402be81953 /sound/pci/oxygen/virtuoso.c | |
parent | 3dd0676335f846e3e7d275c379a112c2f8a832cb (diff) |
ALSA: oxygen: 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>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index 8104eab90e51..64b9fda5f04a 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -58,8 +58,8 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { | |||
58 | }; | 58 | }; |
59 | MODULE_DEVICE_TABLE(pci, xonar_ids); | 59 | MODULE_DEVICE_TABLE(pci, xonar_ids); |
60 | 60 | ||
61 | static int __devinit get_xonar_model(struct oxygen *chip, | 61 | static int get_xonar_model(struct oxygen *chip, |
62 | const struct pci_device_id *id) | 62 | const struct pci_device_id *id) |
63 | { | 63 | { |
64 | if (get_xonar_pcm179x_model(chip, id) >= 0) | 64 | if (get_xonar_pcm179x_model(chip, id) >= 0) |
65 | return 0; | 65 | return 0; |
@@ -70,8 +70,8 @@ static int __devinit get_xonar_model(struct oxygen *chip, | |||
70 | return -EINVAL; | 70 | return -EINVAL; |
71 | } | 71 | } |
72 | 72 | ||
73 | static int __devinit xonar_probe(struct pci_dev *pci, | 73 | static int xonar_probe(struct pci_dev *pci, |
74 | const struct pci_device_id *pci_id) | 74 | const struct pci_device_id *pci_id) |
75 | { | 75 | { |
76 | static int dev; | 76 | static int dev; |
77 | int err; | 77 | int err; |
@@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = { | |||
93 | .name = KBUILD_MODNAME, | 93 | .name = KBUILD_MODNAME, |
94 | .id_table = xonar_ids, | 94 | .id_table = xonar_ids, |
95 | .probe = xonar_probe, | 95 | .probe = xonar_probe, |
96 | .remove = __devexit_p(oxygen_pci_remove), | 96 | .remove = oxygen_pci_remove, |
97 | #ifdef CONFIG_PM_SLEEP | 97 | #ifdef CONFIG_PM_SLEEP |
98 | .driver = { | 98 | .driver = { |
99 | .pm = &oxygen_pci_pm, | 99 | .pm = &oxygen_pci_pm, |