diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:21 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:32:17 -0500 |
commit | 1bff292e9abec7477d43abb2b93c7fd26c44859b (patch) | |
tree | 6c9a58a0f5aacf99a3ee4a964b1fefd4470b0893 /sound/isa/sb | |
parent | f120a6fb486c2500c9ae11fd2da11fbde29bc186 (diff) |
ALSA: isa: 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/isa/sb')
-rw-r--r-- | sound/isa/sb/emu8000.c | 22 | ||||
-rw-r--r-- | sound/isa/sb/jazz16.c | 18 | ||||
-rw-r--r-- | sound/isa/sb/sb16.c | 26 | ||||
-rw-r--r-- | sound/isa/sb/sb8.c | 8 |
4 files changed, 37 insertions, 37 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 2aae6a0efbcd..1d8a0364b9f5 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
@@ -131,7 +131,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode) | |||
131 | 131 | ||
132 | /* | 132 | /* |
133 | */ | 133 | */ |
134 | static void __devinit | 134 | static void |
135 | snd_emu8000_read_wait(struct snd_emu8000 *emu) | 135 | snd_emu8000_read_wait(struct snd_emu8000 *emu) |
136 | { | 136 | { |
137 | while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) { | 137 | while ((EMU8000_SMALR_READ(emu) & 0x80000000) != 0) { |
@@ -143,7 +143,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu) | |||
143 | 143 | ||
144 | /* | 144 | /* |
145 | */ | 145 | */ |
146 | static void __devinit | 146 | static void |
147 | snd_emu8000_write_wait(struct snd_emu8000 *emu) | 147 | snd_emu8000_write_wait(struct snd_emu8000 *emu) |
148 | { | 148 | { |
149 | while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) { | 149 | while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) { |
@@ -156,7 +156,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu) | |||
156 | /* | 156 | /* |
157 | * detect a card at the given port | 157 | * detect a card at the given port |
158 | */ | 158 | */ |
159 | static int __devinit | 159 | static int |
160 | snd_emu8000_detect(struct snd_emu8000 *emu) | 160 | snd_emu8000_detect(struct snd_emu8000 *emu) |
161 | { | 161 | { |
162 | /* Initialise */ | 162 | /* Initialise */ |
@@ -182,7 +182,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu) | |||
182 | /* | 182 | /* |
183 | * intiailize audio channels | 183 | * intiailize audio channels |
184 | */ | 184 | */ |
185 | static void __devinit | 185 | static void |
186 | init_audio(struct snd_emu8000 *emu) | 186 | init_audio(struct snd_emu8000 *emu) |
187 | { | 187 | { |
188 | int ch; | 188 | int ch; |
@@ -223,7 +223,7 @@ init_audio(struct snd_emu8000 *emu) | |||
223 | /* | 223 | /* |
224 | * initialize DMA address | 224 | * initialize DMA address |
225 | */ | 225 | */ |
226 | static void __devinit | 226 | static void |
227 | init_dma(struct snd_emu8000 *emu) | 227 | init_dma(struct snd_emu8000 *emu) |
228 | { | 228 | { |
229 | EMU8000_SMALR_WRITE(emu, 0); | 229 | EMU8000_SMALR_WRITE(emu, 0); |
@@ -327,7 +327,7 @@ static unsigned short init4[128] /*__devinitdata*/ = { | |||
327 | * Taken from the oss driver, not obvious from the doc how this | 327 | * Taken from the oss driver, not obvious from the doc how this |
328 | * is meant to work | 328 | * is meant to work |
329 | */ | 329 | */ |
330 | static void __devinit | 330 | static void |
331 | send_array(struct snd_emu8000 *emu, unsigned short *data, int size) | 331 | send_array(struct snd_emu8000 *emu, unsigned short *data, int size) |
332 | { | 332 | { |
333 | int i; | 333 | int i; |
@@ -349,7 +349,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size) | |||
349 | * Send initialization arrays to start up, this just follows the | 349 | * Send initialization arrays to start up, this just follows the |
350 | * initialisation sequence in the adip. | 350 | * initialisation sequence in the adip. |
351 | */ | 351 | */ |
352 | static void __devinit | 352 | static void |
353 | init_arrays(struct snd_emu8000 *emu) | 353 | init_arrays(struct snd_emu8000 *emu) |
354 | { | 354 | { |
355 | send_array(emu, init1, ARRAY_SIZE(init1)/4); | 355 | send_array(emu, init1, ARRAY_SIZE(init1)/4); |
@@ -375,7 +375,7 @@ init_arrays(struct snd_emu8000 *emu) | |||
375 | * seems that the only way to do this is to use the one channel and keep | 375 | * seems that the only way to do this is to use the one channel and keep |
376 | * reallocating between read and write. | 376 | * reallocating between read and write. |
377 | */ | 377 | */ |
378 | static void __devinit | 378 | static void |
379 | size_dram(struct snd_emu8000 *emu) | 379 | size_dram(struct snd_emu8000 *emu) |
380 | { | 380 | { |
381 | int i, size, detected_size; | 381 | int i, size, detected_size; |
@@ -512,7 +512,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu) | |||
512 | /* | 512 | /* |
513 | * The main initialization routine. | 513 | * The main initialization routine. |
514 | */ | 514 | */ |
515 | static void __devinit | 515 | static void |
516 | snd_emu8000_init_hw(struct snd_emu8000 *emu) | 516 | snd_emu8000_init_hw(struct snd_emu8000 *emu) |
517 | { | 517 | { |
518 | int i; | 518 | int i; |
@@ -1031,7 +1031,7 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = { | |||
1031 | /* | 1031 | /* |
1032 | * create and attach mixer elements for WaveTable treble/bass controls | 1032 | * create and attach mixer elements for WaveTable treble/bass controls |
1033 | */ | 1033 | */ |
1034 | static int __devinit | 1034 | static int |
1035 | snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu) | 1035 | snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu) |
1036 | { | 1036 | { |
1037 | int i, err = 0; | 1037 | int i, err = 0; |
@@ -1082,7 +1082,7 @@ static int snd_emu8000_dev_free(struct snd_device *device) | |||
1082 | /* | 1082 | /* |
1083 | * initialize and register emu8000 synth device. | 1083 | * initialize and register emu8000 synth device. |
1084 | */ | 1084 | */ |
1085 | int __devinit | 1085 | int |
1086 | snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports, | 1086 | snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports, |
1087 | struct snd_seq_device **awe_ret) | 1087 | struct snd_seq_device **awe_ret) |
1088 | { | 1088 | { |
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c index 410758c68090..4961da4e627c 100644 --- a/sound/isa/sb/jazz16.c +++ b/sound/isa/sb/jazz16.c | |||
@@ -78,8 +78,8 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip) | |||
78 | return snd_sb8dsp_interrupt(chip); | 78 | return snd_sb8dsp_interrupt(chip); |
79 | } | 79 | } |
80 | 80 | ||
81 | static int __devinit jazz16_configure_ports(unsigned long port, | 81 | static int jazz16_configure_ports(unsigned long port, |
82 | unsigned long mpu_port, int idx) | 82 | unsigned long mpu_port, int idx) |
83 | { | 83 | { |
84 | unsigned char val; | 84 | unsigned char val; |
85 | 85 | ||
@@ -99,8 +99,8 @@ static int __devinit jazz16_configure_ports(unsigned long port, | |||
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | static int __devinit jazz16_detect_board(unsigned long port, | 102 | static int jazz16_detect_board(unsigned long port, |
103 | unsigned long mpu_port) | 103 | unsigned long mpu_port) |
104 | { | 104 | { |
105 | int err; | 105 | int err; |
106 | int val; | 106 | int val; |
@@ -156,7 +156,7 @@ err_unmap: | |||
156 | return err; | 156 | return err; |
157 | } | 157 | } |
158 | 158 | ||
159 | static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq) | 159 | static int jazz16_configure_board(struct snd_sb *chip, int mpu_irq) |
160 | { | 160 | { |
161 | static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4, | 161 | static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4, |
162 | 0, 2, 5, 0, 0, 0, 0, 6 }; | 162 | 0, 2, 5, 0, 0, 0, 0, 6 }; |
@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq) | |||
183 | return 0; | 183 | return 0; |
184 | } | 184 | } |
185 | 185 | ||
186 | static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev) | 186 | static int snd_jazz16_match(struct device *devptr, unsigned int dev) |
187 | { | 187 | { |
188 | if (!enable[dev]) | 188 | if (!enable[dev]) |
189 | return 0; | 189 | return 0; |
@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev) | |||
218 | return 1; | 218 | return 1; |
219 | } | 219 | } |
220 | 220 | ||
221 | static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev) | 221 | static int snd_jazz16_probe(struct device *devptr, unsigned int dev) |
222 | { | 222 | { |
223 | struct snd_card *card; | 223 | struct snd_card *card; |
224 | struct snd_card_jazz16 *jazz16; | 224 | struct snd_card_jazz16 *jazz16; |
@@ -341,7 +341,7 @@ err_free: | |||
341 | return err; | 341 | return err; |
342 | } | 342 | } |
343 | 343 | ||
344 | static int __devexit snd_jazz16_remove(struct device *devptr, unsigned int dev) | 344 | static int snd_jazz16_remove(struct device *devptr, unsigned int dev) |
345 | { | 345 | { |
346 | struct snd_card *card = dev_get_drvdata(devptr); | 346 | struct snd_card *card = dev_get_drvdata(devptr); |
347 | 347 | ||
@@ -380,7 +380,7 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n) | |||
380 | static struct isa_driver snd_jazz16_driver = { | 380 | static struct isa_driver snd_jazz16_driver = { |
381 | .match = snd_jazz16_match, | 381 | .match = snd_jazz16_match, |
382 | .probe = snd_jazz16_probe, | 382 | .probe = snd_jazz16_probe, |
383 | .remove = __devexit_p(snd_jazz16_remove), | 383 | .remove = snd_jazz16_remove, |
384 | #ifdef CONFIG_PM | 384 | #ifdef CONFIG_PM |
385 | .suspend = snd_jazz16_suspend, | 385 | .suspend = snd_jazz16_suspend, |
386 | .resume = snd_jazz16_resume, | 386 | .resume = snd_jazz16_resume, |
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c index 39b8eca15213..50dbec454f98 100644 --- a/sound/isa/sb/sb16.c +++ b/sound/isa/sb/sb16.c | |||
@@ -250,9 +250,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids); | |||
250 | 250 | ||
251 | #ifdef CONFIG_PNP | 251 | #ifdef CONFIG_PNP |
252 | 252 | ||
253 | static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, | 253 | static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard, |
254 | struct pnp_card_link *card, | 254 | struct pnp_card_link *card, |
255 | const struct pnp_card_device_id *id) | 255 | const struct pnp_card_device_id *id) |
256 | { | 256 | { |
257 | struct pnp_dev *pdev; | 257 | struct pnp_dev *pdev; |
258 | int err; | 258 | int err; |
@@ -337,7 +337,7 @@ static int snd_sb16_card_new(int dev, struct snd_card **cardp) | |||
337 | return 0; | 337 | return 0; |
338 | } | 338 | } |
339 | 339 | ||
340 | static int __devinit snd_sb16_probe(struct snd_card *card, int dev) | 340 | static int snd_sb16_probe(struct snd_card *card, int dev) |
341 | { | 341 | { |
342 | int xirq, xdma8, xdma16; | 342 | int xirq, xdma8, xdma16; |
343 | struct snd_sb *chip; | 343 | struct snd_sb *chip; |
@@ -487,7 +487,7 @@ static int snd_sb16_resume(struct snd_card *card) | |||
487 | } | 487 | } |
488 | #endif | 488 | #endif |
489 | 489 | ||
490 | static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) | 490 | static int snd_sb16_isa_probe1(int dev, struct device *pdev) |
491 | { | 491 | { |
492 | struct snd_card_sb16 *acard; | 492 | struct snd_card_sb16 *acard; |
493 | struct snd_card *card; | 493 | struct snd_card *card; |
@@ -517,12 +517,12 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev) | |||
517 | } | 517 | } |
518 | 518 | ||
519 | 519 | ||
520 | static int __devinit snd_sb16_isa_match(struct device *pdev, unsigned int dev) | 520 | static int snd_sb16_isa_match(struct device *pdev, unsigned int dev) |
521 | { | 521 | { |
522 | return enable[dev] && !is_isapnp_selected(dev); | 522 | return enable[dev] && !is_isapnp_selected(dev); |
523 | } | 523 | } |
524 | 524 | ||
525 | static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev) | 525 | static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev) |
526 | { | 526 | { |
527 | int err; | 527 | int err; |
528 | static int possible_irqs[] = {5, 9, 10, 7, -1}; | 528 | static int possible_irqs[] = {5, 9, 10, 7, -1}; |
@@ -563,7 +563,7 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev) | |||
563 | } | 563 | } |
564 | } | 564 | } |
565 | 565 | ||
566 | static int __devexit snd_sb16_isa_remove(struct device *pdev, unsigned int dev) | 566 | static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev) |
567 | { | 567 | { |
568 | snd_card_free(dev_get_drvdata(pdev)); | 568 | snd_card_free(dev_get_drvdata(pdev)); |
569 | dev_set_drvdata(pdev, NULL); | 569 | dev_set_drvdata(pdev, NULL); |
@@ -592,7 +592,7 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n) | |||
592 | static struct isa_driver snd_sb16_isa_driver = { | 592 | static struct isa_driver snd_sb16_isa_driver = { |
593 | .match = snd_sb16_isa_match, | 593 | .match = snd_sb16_isa_match, |
594 | .probe = snd_sb16_isa_probe, | 594 | .probe = snd_sb16_isa_probe, |
595 | .remove = __devexit_p(snd_sb16_isa_remove), | 595 | .remove = snd_sb16_isa_remove, |
596 | #ifdef CONFIG_PM | 596 | #ifdef CONFIG_PM |
597 | .suspend = snd_sb16_isa_suspend, | 597 | .suspend = snd_sb16_isa_suspend, |
598 | .resume = snd_sb16_isa_resume, | 598 | .resume = snd_sb16_isa_resume, |
@@ -604,8 +604,8 @@ static struct isa_driver snd_sb16_isa_driver = { | |||
604 | 604 | ||
605 | 605 | ||
606 | #ifdef CONFIG_PNP | 606 | #ifdef CONFIG_PNP |
607 | static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard, | 607 | static int snd_sb16_pnp_detect(struct pnp_card_link *pcard, |
608 | const struct pnp_card_device_id *pid) | 608 | const struct pnp_card_device_id *pid) |
609 | { | 609 | { |
610 | static int dev; | 610 | static int dev; |
611 | struct snd_card *card; | 611 | struct snd_card *card; |
@@ -631,7 +631,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard, | |||
631 | return -ENODEV; | 631 | return -ENODEV; |
632 | } | 632 | } |
633 | 633 | ||
634 | static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard) | 634 | static void snd_sb16_pnp_remove(struct pnp_card_link *pcard) |
635 | { | 635 | { |
636 | snd_card_free(pnp_get_card_drvdata(pcard)); | 636 | snd_card_free(pnp_get_card_drvdata(pcard)); |
637 | pnp_set_card_drvdata(pcard, NULL); | 637 | pnp_set_card_drvdata(pcard, NULL); |
@@ -657,7 +657,7 @@ static struct pnp_card_driver sb16_pnpc_driver = { | |||
657 | #endif | 657 | #endif |
658 | .id_table = snd_sb16_pnpids, | 658 | .id_table = snd_sb16_pnpids, |
659 | .probe = snd_sb16_pnp_detect, | 659 | .probe = snd_sb16_pnp_detect, |
660 | .remove = __devexit_p(snd_sb16_pnp_remove), | 660 | .remove = snd_sb16_pnp_remove, |
661 | #ifdef CONFIG_PM | 661 | #ifdef CONFIG_PM |
662 | .suspend = snd_sb16_pnp_suspend, | 662 | .suspend = snd_sb16_pnp_suspend, |
663 | .resume = snd_sb16_pnp_resume, | 663 | .resume = snd_sb16_pnp_resume, |
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index ab5cebea52e1..237d964ff8a6 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c | |||
@@ -79,7 +79,7 @@ static void snd_sb8_free(struct snd_card *card) | |||
79 | release_and_free_resource(acard->fm_res); | 79 | release_and_free_resource(acard->fm_res); |
80 | } | 80 | } |
81 | 81 | ||
82 | static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev) | 82 | static int snd_sb8_match(struct device *pdev, unsigned int dev) |
83 | { | 83 | { |
84 | if (!enable[dev]) | 84 | if (!enable[dev]) |
85 | return 0; | 85 | return 0; |
@@ -94,7 +94,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev) | |||
94 | return 1; | 94 | return 1; |
95 | } | 95 | } |
96 | 96 | ||
97 | static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) | 97 | static int snd_sb8_probe(struct device *pdev, unsigned int dev) |
98 | { | 98 | { |
99 | struct snd_sb *chip; | 99 | struct snd_sb *chip; |
100 | struct snd_card *card; | 100 | struct snd_card *card; |
@@ -205,7 +205,7 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) | |||
205 | return err; | 205 | return err; |
206 | } | 206 | } |
207 | 207 | ||
208 | static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev) | 208 | static int snd_sb8_remove(struct device *pdev, unsigned int dev) |
209 | { | 209 | { |
210 | snd_card_free(dev_get_drvdata(pdev)); | 210 | snd_card_free(dev_get_drvdata(pdev)); |
211 | dev_set_drvdata(pdev, NULL); | 211 | dev_set_drvdata(pdev, NULL); |
@@ -244,7 +244,7 @@ static int snd_sb8_resume(struct device *dev, unsigned int n) | |||
244 | static struct isa_driver snd_sb8_driver = { | 244 | static struct isa_driver snd_sb8_driver = { |
245 | .match = snd_sb8_match, | 245 | .match = snd_sb8_match, |
246 | .probe = snd_sb8_probe, | 246 | .probe = snd_sb8_probe, |
247 | .remove = __devexit_p(snd_sb8_remove), | 247 | .remove = snd_sb8_remove, |
248 | #ifdef CONFIG_PM | 248 | #ifdef CONFIG_PM |
249 | .suspend = snd_sb8_suspend, | 249 | .suspend = snd_sb8_suspend, |
250 | .resume = snd_sb8_resume, | 250 | .resume = snd_sb8_resume, |