Skip to content

Commit

Permalink
fbdev: *bfin*: fix __dev{init,exit} markings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Jun 17, 2009
1 parent 3608c66 commit 8f09d74
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions drivers/video/bf54x-lq043fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
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 fb_info *fbinfo;
Expand Down Expand Up @@ -709,7 +709,7 @@ static int __init bfin_bf54x_probe(struct platform_device *pdev)
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);
Expand Down Expand Up @@ -778,7 +778,7 @@ static int bfin_bf54x_resume(struct platform_device *pdev)

static struct platform_driver bfin_bf54x_driver = {
.probe = bfin_bf54x_probe,
.remove = bfin_bf54x_remove,
.remove = __devexit_p(bfin_bf54x_remove),
.suspend = bfin_bf54x_suspend,
.resume = bfin_bf54x_resume,
.driver = {
Expand All @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/video/bfin-t350mcqb-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
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);
Expand Down Expand Up @@ -655,7 +655,7 @@ static int bfin_t350mcqb_resume(struct platform_device *pdev)

static struct platform_driver bfin_t350mcqb_driver = {
.probe = bfin_t350mcqb_probe,
.remove = bfin_t350mcqb_remove,
.remove = __devexit_p(bfin_t350mcqb_remove),
.suspend = bfin_t350mcqb_suspend,
.resume = bfin_t350mcqb_resume,
.driver = {
Expand All @@ -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);
}
Expand Down

0 comments on commit 8f09d74

Please sign in to comment.