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/cs4281.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/cs4281.c')
-rw-r--r-- | sound/pci/cs4281.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 8e86ec0031fc..6a8695069941 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
@@ -969,8 +969,8 @@ static struct snd_pcm_ops snd_cs4281_capture_ops = { | |||
969 | .pointer = snd_cs4281_pointer, | 969 | .pointer = snd_cs4281_pointer, |
970 | }; | 970 | }; |
971 | 971 | ||
972 | static int __devinit snd_cs4281_pcm(struct cs4281 * chip, int device, | 972 | static int snd_cs4281_pcm(struct cs4281 *chip, int device, |
973 | struct snd_pcm ** rpcm) | 973 | struct snd_pcm **rpcm) |
974 | { | 974 | { |
975 | struct snd_pcm *pcm; | 975 | struct snd_pcm *pcm; |
976 | int err; | 976 | int err; |
@@ -1093,7 +1093,7 @@ static void snd_cs4281_mixer_free_ac97(struct snd_ac97 *ac97) | |||
1093 | chip->ac97 = NULL; | 1093 | chip->ac97 = NULL; |
1094 | } | 1094 | } |
1095 | 1095 | ||
1096 | static int __devinit snd_cs4281_mixer(struct cs4281 * chip) | 1096 | static int snd_cs4281_mixer(struct cs4281 *chip) |
1097 | { | 1097 | { |
1098 | struct snd_card *card = chip->card; | 1098 | struct snd_card *card = chip->card; |
1099 | struct snd_ac97_template ac97; | 1099 | struct snd_ac97_template ac97; |
@@ -1171,7 +1171,7 @@ static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = { | |||
1171 | .read = snd_cs4281_BA1_read, | 1171 | .read = snd_cs4281_BA1_read, |
1172 | }; | 1172 | }; |
1173 | 1173 | ||
1174 | static void __devinit snd_cs4281_proc_init(struct cs4281 * chip) | 1174 | static void snd_cs4281_proc_init(struct cs4281 *chip) |
1175 | { | 1175 | { |
1176 | struct snd_info_entry *entry; | 1176 | struct snd_info_entry *entry; |
1177 | 1177 | ||
@@ -1259,7 +1259,7 @@ static int snd_cs4281_gameport_open(struct gameport *gameport, int mode) | |||
1259 | return 0; | 1259 | return 0; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | static int __devinit snd_cs4281_create_gameport(struct cs4281 *chip) | 1262 | static int snd_cs4281_create_gameport(struct cs4281 *chip) |
1263 | { | 1263 | { |
1264 | struct gameport *gp; | 1264 | struct gameport *gp; |
1265 | 1265 | ||
@@ -1335,10 +1335,10 @@ static int snd_cs4281_dev_free(struct snd_device *device) | |||
1335 | 1335 | ||
1336 | static int snd_cs4281_chip_init(struct cs4281 *chip); /* defined below */ | 1336 | static int snd_cs4281_chip_init(struct cs4281 *chip); /* defined below */ |
1337 | 1337 | ||
1338 | static int __devinit snd_cs4281_create(struct snd_card *card, | 1338 | static int snd_cs4281_create(struct snd_card *card, |
1339 | struct pci_dev *pci, | 1339 | struct pci_dev *pci, |
1340 | struct cs4281 ** rchip, | 1340 | struct cs4281 **rchip, |
1341 | int dual_codec) | 1341 | int dual_codec) |
1342 | { | 1342 | { |
1343 | struct cs4281 *chip; | 1343 | struct cs4281 *chip; |
1344 | unsigned int tmp; | 1344 | unsigned int tmp; |
@@ -1779,8 +1779,8 @@ static struct snd_rawmidi_ops snd_cs4281_midi_input = | |||
1779 | .trigger = snd_cs4281_midi_input_trigger, | 1779 | .trigger = snd_cs4281_midi_input_trigger, |
1780 | }; | 1780 | }; |
1781 | 1781 | ||
1782 | static int __devinit snd_cs4281_midi(struct cs4281 * chip, int device, | 1782 | static int snd_cs4281_midi(struct cs4281 *chip, int device, |
1783 | struct snd_rawmidi **rrawmidi) | 1783 | struct snd_rawmidi **rrawmidi) |
1784 | { | 1784 | { |
1785 | struct snd_rawmidi *rmidi; | 1785 | struct snd_rawmidi *rmidi; |
1786 | int err; | 1786 | int err; |
@@ -1901,8 +1901,8 @@ static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd, | |||
1901 | spin_unlock_irqrestore(&opl3->reg_lock, flags); | 1901 | spin_unlock_irqrestore(&opl3->reg_lock, flags); |
1902 | } | 1902 | } |
1903 | 1903 | ||
1904 | static int __devinit snd_cs4281_probe(struct pci_dev *pci, | 1904 | static int snd_cs4281_probe(struct pci_dev *pci, |
1905 | const struct pci_device_id *pci_id) | 1905 | const struct pci_device_id *pci_id) |
1906 | { | 1906 | { |
1907 | static int dev; | 1907 | static int dev; |
1908 | struct snd_card *card; | 1908 | struct snd_card *card; |
@@ -1968,7 +1968,7 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci, | |||
1968 | return 0; | 1968 | return 0; |
1969 | } | 1969 | } |
1970 | 1970 | ||
1971 | static void __devexit snd_cs4281_remove(struct pci_dev *pci) | 1971 | static void snd_cs4281_remove(struct pci_dev *pci) |
1972 | { | 1972 | { |
1973 | snd_card_free(pci_get_drvdata(pci)); | 1973 | snd_card_free(pci_get_drvdata(pci)); |
1974 | pci_set_drvdata(pci, NULL); | 1974 | pci_set_drvdata(pci, NULL); |
@@ -2095,7 +2095,7 @@ static struct pci_driver cs4281_driver = { | |||
2095 | .name = KBUILD_MODNAME, | 2095 | .name = KBUILD_MODNAME, |
2096 | .id_table = snd_cs4281_ids, | 2096 | .id_table = snd_cs4281_ids, |
2097 | .probe = snd_cs4281_probe, | 2097 | .probe = snd_cs4281_probe, |
2098 | .remove = __devexit_p(snd_cs4281_remove), | 2098 | .remove = snd_cs4281_remove, |
2099 | .driver = { | 2099 | .driver = { |
2100 | .pm = CS4281_PM_OPS, | 2100 | .pm = CS4281_PM_OPS, |
2101 | }, | 2101 | }, |