diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-16 18:34:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:48:03 -0400 |
commit | 8f09d74a6165c210d5d58d10c2bd58a8c13b0ca8 (patch) | |
tree | d4d048bf00c82934fcb3772086f1a6339ed152ff | |
parent | 3608c66c2e6522952b4be219317b194ab27f4e78 (diff) |
fbdev: *bfin*: fix __dev{init,exit} markings
The remove member of the platform_driver bfin_t350mcqb_driver should use
__devexit_p() to refer to the remove function, and that function should
get __devexit markings. Likewise, the probe function should be marked
with __devinit and not __init.
Also, module_init() functions should be marked with __init rather than
__devinit.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/bf54x-lq043fb.c | 8 | ||||
-rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 6439a437ddf9..8aa67dea06db 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -529,7 +529,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id) | |||
529 | return IRQ_HANDLED; | 529 | return IRQ_HANDLED; |
530 | } | 530 | } |
531 | 531 | ||
532 | static int __init bfin_bf54x_probe(struct platform_device *pdev) | 532 | static int __devinit bfin_bf54x_probe(struct platform_device *pdev) |
533 | { | 533 | { |
534 | struct bfin_bf54xfb_info *info; | 534 | struct bfin_bf54xfb_info *info; |
535 | struct fb_info *fbinfo; | 535 | struct fb_info *fbinfo; |
@@ -709,7 +709,7 @@ out1: | |||
709 | return ret; | 709 | return ret; |
710 | } | 710 | } |
711 | 711 | ||
712 | static int bfin_bf54x_remove(struct platform_device *pdev) | 712 | static int __devexit bfin_bf54x_remove(struct platform_device *pdev) |
713 | { | 713 | { |
714 | 714 | ||
715 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 715 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
@@ -778,7 +778,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev) | |||
778 | 778 | ||
779 | static struct platform_driver bfin_bf54x_driver = { | 779 | static struct platform_driver bfin_bf54x_driver = { |
780 | .probe = bfin_bf54x_probe, | 780 | .probe = bfin_bf54x_probe, |
781 | .remove = bfin_bf54x_remove, | 781 | .remove = __devexit_p(bfin_bf54x_remove), |
782 | .suspend = bfin_bf54x_suspend, | 782 | .suspend = bfin_bf54x_suspend, |
783 | .resume = bfin_bf54x_resume, | 783 | .resume = bfin_bf54x_resume, |
784 | .driver = { | 784 | .driver = { |
@@ -787,7 +787,7 @@ static struct platform_driver bfin_bf54x_driver = { | |||
787 | }, | 787 | }, |
788 | }; | 788 | }; |
789 | 789 | ||
790 | static int __devinit bfin_bf54x_driver_init(void) | 790 | static int __init bfin_bf54x_driver_init(void) |
791 | { | 791 | { |
792 | return platform_driver_register(&bfin_bf54x_driver); | 792 | return platform_driver_register(&bfin_bf54x_driver); |
793 | } | 793 | } |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index f40eef8d1dda..5cc36cfbf07b 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -599,7 +599,7 @@ out1: | |||
599 | return ret; | 599 | return ret; |
600 | } | 600 | } |
601 | 601 | ||
602 | static int bfin_t350mcqb_remove(struct platform_device *pdev) | 602 | static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev) |
603 | { | 603 | { |
604 | 604 | ||
605 | struct fb_info *fbinfo = platform_get_drvdata(pdev); | 605 | struct fb_info *fbinfo = platform_get_drvdata(pdev); |
@@ -655,7 +655,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev) | |||
655 | 655 | ||
656 | static struct platform_driver bfin_t350mcqb_driver = { | 656 | static struct platform_driver bfin_t350mcqb_driver = { |
657 | .probe = bfin_t350mcqb_probe, | 657 | .probe = bfin_t350mcqb_probe, |
658 | .remove = bfin_t350mcqb_remove, | 658 | .remove = __devexit_p(bfin_t350mcqb_remove), |
659 | .suspend = bfin_t350mcqb_suspend, | 659 | .suspend = bfin_t350mcqb_suspend, |
660 | .resume = bfin_t350mcqb_resume, | 660 | .resume = bfin_t350mcqb_resume, |
661 | .driver = { | 661 | .driver = { |
@@ -664,7 +664,7 @@ static struct platform_driver bfin_t350mcqb_driver = { | |||
664 | }, | 664 | }, |
665 | }; | 665 | }; |
666 | 666 | ||
667 | static int __devinit bfin_t350mcqb_driver_init(void) | 667 | static int __init bfin_t350mcqb_driver_init(void) |
668 | { | 668 | { |
669 | return platform_driver_register(&bfin_t350mcqb_driver); | 669 | return platform_driver_register(&bfin_t350mcqb_driver); |
670 | } | 670 | } |