diff options
author | Prarit Bhargava <prarit@redhat.com> | 2007-02-13 07:11:11 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-14 02:38:28 -0500 |
commit | 788c6043335590e0a483fdc18f85b1405a157bf9 (patch) | |
tree | 23e24335e62ba0f692da4707933c7680e94fa1d8 /sound/drivers/dummy.c | |
parent | 46f02ca36e9b2b690ebcef18fa0652c586d6c08e (diff) |
[ALSA] Fix __devinit and __devexit issues with sound drivers
Fix __devinit and __devexit issues with sound drivers.
Resolves MODPOST warnings similar to:
WARNING: sound/drivers/snd-dummy.o - Section mismatch: reference to .init.text:snd_dummy_probe from .data.rel.local between 'snd_dummy_driver' (at offset 0x0) and 'snd_dummy_controls'
WARNING: sound/drivers/snd-mtpav.o - Section mismatch: reference to .init.text:snd_mtpav_probe from .data.rel.local between 'snd_mtpav_driver' (at offset 0x0) and 'snd_mtpav_input'
WARNING: sound/drivers/snd-virmidi.o - Section mismatch: reference to .init.text:snd_virmidi_probe from .data.rel.local after 'snd_virmidi_driver' (at offset 0x0)
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/drivers/dummy.c')
-rw-r--r-- | sound/drivers/dummy.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 8339bad969ba..a0f28f51fc7e 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c | |||
@@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = { | |||
423 | .pointer = snd_card_dummy_pcm_pointer, | 423 | .pointer = snd_card_dummy_pcm_pointer, |
424 | }; | 424 | }; |
425 | 425 | ||
426 | static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams) | 426 | static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, |
427 | int substreams) | ||
427 | { | 428 | { |
428 | struct snd_pcm *pcm; | 429 | struct snd_pcm *pcm; |
429 | int err; | 430 | int err; |
@@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD), | |||
562 | DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD) | 563 | DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD) |
563 | }; | 564 | }; |
564 | 565 | ||
565 | static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) | 566 | static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) |
566 | { | 567 | { |
567 | struct snd_card *card = dummy->card; | 568 | struct snd_card *card = dummy->card; |
568 | unsigned int idx; | 569 | unsigned int idx; |
@@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) | |||
579 | return 0; | 580 | return 0; |
580 | } | 581 | } |
581 | 582 | ||
582 | static int __init snd_dummy_probe(struct platform_device *devptr) | 583 | static int __devinit snd_dummy_probe(struct platform_device *devptr) |
583 | { | 584 | { |
584 | struct snd_card *card; | 585 | struct snd_card *card; |
585 | struct snd_dummy *dummy; | 586 | struct snd_dummy *dummy; |
@@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr) | |||
617 | return err; | 618 | return err; |
618 | } | 619 | } |
619 | 620 | ||
620 | static int snd_dummy_remove(struct platform_device *devptr) | 621 | static int __devexit snd_dummy_remove(struct platform_device *devptr) |
621 | { | 622 | { |
622 | snd_card_free(platform_get_drvdata(devptr)); | 623 | snd_card_free(platform_get_drvdata(devptr)); |
623 | platform_set_drvdata(devptr, NULL); | 624 | platform_set_drvdata(devptr, NULL); |
@@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev) | |||
648 | 649 | ||
649 | static struct platform_driver snd_dummy_driver = { | 650 | static struct platform_driver snd_dummy_driver = { |
650 | .probe = snd_dummy_probe, | 651 | .probe = snd_dummy_probe, |
651 | .remove = snd_dummy_remove, | 652 | .remove = __devexit_p(snd_dummy_remove), |
652 | #ifdef CONFIG_PM | 653 | #ifdef CONFIG_PM |
653 | .suspend = snd_dummy_suspend, | 654 | .suspend = snd_dummy_suspend, |
654 | .resume = snd_dummy_resume, | 655 | .resume = snd_dummy_resume, |