Commit 8f09d74a authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds

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: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3608c66c
...@@ -529,7 +529,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id) ...@@ -529,7 +529,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __init bfin_bf54x_probe(struct platform_device *pdev) static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
{ {
struct bfin_bf54xfb_info *info; struct bfin_bf54xfb_info *info;
struct fb_info *fbinfo; struct fb_info *fbinfo;
...@@ -709,7 +709,7 @@ out1: ...@@ -709,7 +709,7 @@ out1:
return ret; return ret;
} }
static int bfin_bf54x_remove(struct platform_device *pdev) static int __devexit bfin_bf54x_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
...@@ -778,7 +778,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev) ...@@ -778,7 +778,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev)
static struct platform_driver bfin_bf54x_driver = { static struct platform_driver bfin_bf54x_driver = {
.probe = bfin_bf54x_probe, .probe = bfin_bf54x_probe,
.remove = bfin_bf54x_remove, .remove = __devexit_p(bfin_bf54x_remove),
.suspend = bfin_bf54x_suspend, .suspend = bfin_bf54x_suspend,
.resume = bfin_bf54x_resume, .resume = bfin_bf54x_resume,
.driver = { .driver = {
...@@ -787,7 +787,7 @@ static struct platform_driver bfin_bf54x_driver = { ...@@ -787,7 +787,7 @@ static struct platform_driver bfin_bf54x_driver = {
}, },
}; };
static int __devinit bfin_bf54x_driver_init(void) static int __init bfin_bf54x_driver_init(void)
{ {
return platform_driver_register(&bfin_bf54x_driver); return platform_driver_register(&bfin_bf54x_driver);
} }
......
...@@ -599,7 +599,7 @@ out1: ...@@ -599,7 +599,7 @@ out1:
return ret; return ret;
} }
static int bfin_t350mcqb_remove(struct platform_device *pdev) static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev)
{ {
struct fb_info *fbinfo = platform_get_drvdata(pdev); struct fb_info *fbinfo = platform_get_drvdata(pdev);
...@@ -655,7 +655,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev) ...@@ -655,7 +655,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev)
static struct platform_driver bfin_t350mcqb_driver = { static struct platform_driver bfin_t350mcqb_driver = {
.probe = bfin_t350mcqb_probe, .probe = bfin_t350mcqb_probe,
.remove = bfin_t350mcqb_remove, .remove = __devexit_p(bfin_t350mcqb_remove),
.suspend = bfin_t350mcqb_suspend, .suspend = bfin_t350mcqb_suspend,
.resume = bfin_t350mcqb_resume, .resume = bfin_t350mcqb_resume,
.driver = { .driver = {
...@@ -664,7 +664,7 @@ static struct platform_driver bfin_t350mcqb_driver = { ...@@ -664,7 +664,7 @@ static struct platform_driver bfin_t350mcqb_driver = {
}, },
}; };
static int __devinit bfin_t350mcqb_driver_init(void) static int __init bfin_t350mcqb_driver_init(void)
{ {
return platform_driver_register(&bfin_t350mcqb_driver); return platform_driver_register(&bfin_t350mcqb_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment