Commit bd9b5caf authored by Henrik Kretzschmar's avatar Henrik Kretzschmar Committed by Linus Torvalds
Browse files

fbdev: section cleanup in arcfb



Fix the sections in the arcfb driver, by moving:

*	the variables arcfb_fix and arcfb_var from .init.data to .devinit.data

*	arcfb_remove() from .text to .devexit.text

This fixes the following warnings issued by modpost:

WARNING: drivers/video/built-in.o(.devinit.text+0x543): Section mismatch in reference from the function arcfb_probe() to the variable .init.data:arcfb_var
The function __devinit arcfb_probe() references
a variable __initdata arcfb_var.
If arcfb_var is only used by arcfb_probe then
annotate arcfb_var with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x558): Section mismatch in reference from the function arcfb_probe() to the variable .init.data:arcfb_fix
The function __devinit arcfb_probe() references
a variable __initdata arcfb_fix.
If arcfb_fix is only used by arcfb_probe then
annotate arcfb_fix with a matching annotation.
Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: <stable@kernel.org>	[if "platform-drivers: move probe to .devinit.text in drivers/video" was merged]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dbd536bf
...@@ -80,7 +80,7 @@ struct arcfb_par { ...@@ -80,7 +80,7 @@ struct arcfb_par {
spinlock_t lock; spinlock_t lock;
}; };
static struct fb_fix_screeninfo arcfb_fix __initdata = { static struct fb_fix_screeninfo arcfb_fix __devinitdata = {
.id = "arcfb", .id = "arcfb",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO01, .visual = FB_VISUAL_MONO01,
...@@ -90,7 +90,7 @@ static struct fb_fix_screeninfo arcfb_fix __initdata = { ...@@ -90,7 +90,7 @@ static struct fb_fix_screeninfo arcfb_fix __initdata = {
.accel = FB_ACCEL_NONE, .accel = FB_ACCEL_NONE,
}; };
static struct fb_var_screeninfo arcfb_var __initdata = { static struct fb_var_screeninfo arcfb_var __devinitdata = {
.xres = 128, .xres = 128,
.yres = 64, .yres = 64,
.xres_virtual = 128, .xres_virtual = 128,
...@@ -588,7 +588,7 @@ err: ...@@ -588,7 +588,7 @@ err:
return retval; return retval;
} }
static int arcfb_remove(struct platform_device *dev) static int __devexit arcfb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
...@@ -602,7 +602,7 @@ static int arcfb_remove(struct platform_device *dev) ...@@ -602,7 +602,7 @@ static int arcfb_remove(struct platform_device *dev)
static struct platform_driver arcfb_driver = { static struct platform_driver arcfb_driver = {
.probe = arcfb_probe, .probe = arcfb_probe,
.remove = arcfb_remove, .remove = __devexit_p(arcfb_remove),
.driver = { .driver = {
.name = "arcfb", .name = "arcfb",
}, },
......
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