aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ymfpci/ymfpci.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:10 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:20:55 -0500
commite23e7a1436207217000c2854214bc908936af3cb (patch)
treeaebb83a4e59dde76a79ac60b51b67849c75c545b /sound/pci/ymfpci/ymfpci.c
parent445a51b353c35fe54840c10352ef51152fbb94df (diff)
ALSA: pci: 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/pci/ymfpci/ymfpci.c')
-rw-r--r--sound/pci/ymfpci/ymfpci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e01fe34db9ec..01c49655a3c1 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -79,8 +79,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_ymfpci_ids) = {
79MODULE_DEVICE_TABLE(pci, snd_ymfpci_ids); 79MODULE_DEVICE_TABLE(pci, snd_ymfpci_ids);
80 80
81#ifdef SUPPORT_JOYSTICK 81#ifdef SUPPORT_JOYSTICK
82static int __devinit snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev, 82static int snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev,
83 int legacy_ctrl, int legacy_ctrl2) 83 int legacy_ctrl, int legacy_ctrl2)
84{ 84{
85 struct gameport *gp; 85 struct gameport *gp;
86 struct resource *r = NULL; 86 struct resource *r = NULL;
@@ -167,8 +167,8 @@ static inline int snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev, i
167void snd_ymfpci_free_gameport(struct snd_ymfpci *chip) { } 167void snd_ymfpci_free_gameport(struct snd_ymfpci *chip) { }
168#endif /* SUPPORT_JOYSTICK */ 168#endif /* SUPPORT_JOYSTICK */
169 169
170static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, 170static int snd_card_ymfpci_probe(struct pci_dev *pci,
171 const struct pci_device_id *pci_id) 171 const struct pci_device_id *pci_id)
172{ 172{
173 static int dev; 173 static int dev;
174 struct snd_card *card; 174 struct snd_card *card;
@@ -344,7 +344,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
344 return 0; 344 return 0;
345} 345}
346 346
347static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci) 347static void snd_card_ymfpci_remove(struct pci_dev *pci)
348{ 348{
349 snd_card_free(pci_get_drvdata(pci)); 349 snd_card_free(pci_get_drvdata(pci));
350 pci_set_drvdata(pci, NULL); 350 pci_set_drvdata(pci, NULL);
@@ -354,7 +354,7 @@ static struct pci_driver ymfpci_driver = {
354 .name = KBUILD_MODNAME, 354 .name = KBUILD_MODNAME,
355 .id_table = snd_ymfpci_ids, 355 .id_table = snd_ymfpci_ids,
356 .probe = snd_card_ymfpci_probe, 356 .probe = snd_card_ymfpci_probe,
357 .remove = __devexit_p(snd_card_ymfpci_remove), 357 .remove = snd_card_ymfpci_remove,
358#ifdef CONFIG_PM_SLEEP 358#ifdef CONFIG_PM_SLEEP
359 .driver = { 359 .driver = {
360 .pm = &snd_ymfpci_pm, 360 .pm = &snd_ymfpci_pm,