aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/es1938.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/es1938.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/es1938.c')
-rw-r--r--sound/pci/es1938.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 394c5d413530..8423403954ab 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1027,7 +1027,7 @@ static struct snd_pcm_ops snd_es1938_capture_ops = {
1027 .copy = snd_es1938_capture_copy, 1027 .copy = snd_es1938_capture_copy,
1028}; 1028};
1029 1029
1030static int __devinit snd_es1938_new_pcm(struct es1938 *chip, int device) 1030static int snd_es1938_new_pcm(struct es1938 *chip, int device)
1031{ 1031{
1032 struct snd_pcm *pcm; 1032 struct snd_pcm *pcm;
1033 int err; 1033 int err;
@@ -1539,7 +1539,7 @@ static SIMPLE_DEV_PM_OPS(es1938_pm, es1938_suspend, es1938_resume);
1539#endif /* CONFIG_PM_SLEEP */ 1539#endif /* CONFIG_PM_SLEEP */
1540 1540
1541#ifdef SUPPORT_JOYSTICK 1541#ifdef SUPPORT_JOYSTICK
1542static int __devinit snd_es1938_create_gameport(struct es1938 *chip) 1542static int snd_es1938_create_gameport(struct es1938 *chip)
1543{ 1543{
1544 struct gameport *gp; 1544 struct gameport *gp;
1545 1545
@@ -1594,9 +1594,9 @@ static int snd_es1938_dev_free(struct snd_device *device)
1594 return snd_es1938_free(chip); 1594 return snd_es1938_free(chip);
1595} 1595}
1596 1596
1597static int __devinit snd_es1938_create(struct snd_card *card, 1597static int snd_es1938_create(struct snd_card *card,
1598 struct pci_dev * pci, 1598 struct pci_dev *pci,
1599 struct es1938 ** rchip) 1599 struct es1938 **rchip)
1600{ 1600{
1601 struct es1938 *chip; 1601 struct es1938 *chip;
1602 int err; 1602 int err;
@@ -1754,7 +1754,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
1754 1754
1755#define ES1938_DMA_SIZE 64 1755#define ES1938_DMA_SIZE 64
1756 1756
1757static int __devinit snd_es1938_mixer(struct es1938 *chip) 1757static int snd_es1938_mixer(struct es1938 *chip)
1758{ 1758{
1759 struct snd_card *card; 1759 struct snd_card *card;
1760 unsigned int idx; 1760 unsigned int idx;
@@ -1792,8 +1792,8 @@ static int __devinit snd_es1938_mixer(struct es1938 *chip)
1792} 1792}
1793 1793
1794 1794
1795static int __devinit snd_es1938_probe(struct pci_dev *pci, 1795static int snd_es1938_probe(struct pci_dev *pci,
1796 const struct pci_device_id *pci_id) 1796 const struct pci_device_id *pci_id)
1797{ 1797{
1798 static int dev; 1798 static int dev;
1799 struct snd_card *card; 1799 struct snd_card *card;
@@ -1878,7 +1878,7 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,
1878 return 0; 1878 return 0;
1879} 1879}
1880 1880
1881static void __devexit snd_es1938_remove(struct pci_dev *pci) 1881static void snd_es1938_remove(struct pci_dev *pci)
1882{ 1882{
1883 snd_card_free(pci_get_drvdata(pci)); 1883 snd_card_free(pci_get_drvdata(pci));
1884 pci_set_drvdata(pci, NULL); 1884 pci_set_drvdata(pci, NULL);
@@ -1888,7 +1888,7 @@ static struct pci_driver es1938_driver = {
1888 .name = KBUILD_MODNAME, 1888 .name = KBUILD_MODNAME,
1889 .id_table = snd_es1938_ids, 1889 .id_table = snd_es1938_ids,
1890 .probe = snd_es1938_probe, 1890 .probe = snd_es1938_probe,
1891 .remove = __devexit_p(snd_es1938_remove), 1891 .remove = snd_es1938_remove,
1892 .driver = { 1892 .driver = {
1893 .pm = ES1938_PM_OPS, 1893 .pm = ES1938_PM_OPS,
1894 }, 1894 },