diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:10 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:20:55 -0500 |
commit | e23e7a1436207217000c2854214bc908936af3cb (patch) | |
tree | aebb83a4e59dde76a79ac60b51b67849c75c545b /sound/pci/sis7019.c | |
parent | 445a51b353c35fe54840c10352ef51152fbb94df (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/sis7019.c')
-rw-r--r-- | sound/pci/sis7019.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 51e43407ebc5..550b9cfb8e3e 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -894,7 +894,7 @@ static struct snd_pcm_ops sis_capture_ops = { | |||
894 | .pointer = sis_pcm_pointer, | 894 | .pointer = sis_pcm_pointer, |
895 | }; | 895 | }; |
896 | 896 | ||
897 | static int __devinit sis_pcm_create(struct sis7019 *sis) | 897 | static int sis_pcm_create(struct sis7019 *sis) |
898 | { | 898 | { |
899 | struct snd_pcm *pcm; | 899 | struct snd_pcm *pcm; |
900 | int rc; | 900 | int rc; |
@@ -1013,7 +1013,7 @@ static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg) | |||
1013 | (reg << 8) | cmd[ac97->num]); | 1013 | (reg << 8) | cmd[ac97->num]); |
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | static int __devinit sis_mixer_create(struct sis7019 *sis) | 1016 | static int sis_mixer_create(struct sis7019 *sis) |
1017 | { | 1017 | { |
1018 | struct snd_ac97_bus *bus; | 1018 | struct snd_ac97_bus *bus; |
1019 | struct snd_ac97_template ac97; | 1019 | struct snd_ac97_template ac97; |
@@ -1326,8 +1326,8 @@ static int sis_alloc_suspend(struct sis7019 *sis) | |||
1326 | return 0; | 1326 | return 0; |
1327 | } | 1327 | } |
1328 | 1328 | ||
1329 | static int __devinit sis_chip_create(struct snd_card *card, | 1329 | static int sis_chip_create(struct snd_card *card, |
1330 | struct pci_dev *pci) | 1330 | struct pci_dev *pci) |
1331 | { | 1331 | { |
1332 | struct sis7019 *sis = card->private_data; | 1332 | struct sis7019 *sis = card->private_data; |
1333 | struct voice *voice; | 1333 | struct voice *voice; |
@@ -1417,8 +1417,8 @@ error_out: | |||
1417 | return rc; | 1417 | return rc; |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | static int __devinit snd_sis7019_probe(struct pci_dev *pci, | 1420 | static int snd_sis7019_probe(struct pci_dev *pci, |
1421 | const struct pci_device_id *pci_id) | 1421 | const struct pci_device_id *pci_id) |
1422 | { | 1422 | { |
1423 | struct snd_card *card; | 1423 | struct snd_card *card; |
1424 | struct sis7019 *sis; | 1424 | struct sis7019 *sis; |
@@ -1478,7 +1478,7 @@ error_out: | |||
1478 | return rc; | 1478 | return rc; |
1479 | } | 1479 | } |
1480 | 1480 | ||
1481 | static void __devexit snd_sis7019_remove(struct pci_dev *pci) | 1481 | static void snd_sis7019_remove(struct pci_dev *pci) |
1482 | { | 1482 | { |
1483 | snd_card_free(pci_get_drvdata(pci)); | 1483 | snd_card_free(pci_get_drvdata(pci)); |
1484 | pci_set_drvdata(pci, NULL); | 1484 | pci_set_drvdata(pci, NULL); |
@@ -1488,7 +1488,7 @@ static struct pci_driver sis7019_driver = { | |||
1488 | .name = KBUILD_MODNAME, | 1488 | .name = KBUILD_MODNAME, |
1489 | .id_table = snd_sis7019_ids, | 1489 | .id_table = snd_sis7019_ids, |
1490 | .probe = snd_sis7019_probe, | 1490 | .probe = snd_sis7019_probe, |
1491 | .remove = __devexit_p(snd_sis7019_remove), | 1491 | .remove = snd_sis7019_remove, |
1492 | .driver = { | 1492 | .driver = { |
1493 | .pm = SIS_PM_OPS, | 1493 | .pm = SIS_PM_OPS, |
1494 | }, | 1494 | }, |