diff options
| author | Henrik Kretzschmar <henne@nachtwindheim.de> | 2010-05-24 17:33:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:08 -0400 |
| commit | bd9b5caf8616501d2ab6f17210b11f81ea7546eb (patch) | |
| tree | d6728d43429d72dd3dd6b9f7aa4b6887abd9881f | |
| parent | dbd536bf2f1b494240b56035ee16eba2e3d89b6a (diff) | |
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: Henrik Kretzschmar <henne@nachtwindheim.de>
Acked-by: Uwe 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/arcfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 8d406fb689c1..f3d7440f0072 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
| @@ -80,7 +80,7 @@ struct arcfb_par { | |||
| 80 | spinlock_t lock; | 80 | spinlock_t lock; |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | static struct fb_fix_screeninfo arcfb_fix __initdata = { | 83 | static struct fb_fix_screeninfo arcfb_fix __devinitdata = { |
| 84 | .id = "arcfb", | 84 | .id = "arcfb", |
| 85 | .type = FB_TYPE_PACKED_PIXELS, | 85 | .type = FB_TYPE_PACKED_PIXELS, |
| 86 | .visual = FB_VISUAL_MONO01, | 86 | .visual = FB_VISUAL_MONO01, |
| @@ -90,7 +90,7 @@ static struct fb_fix_screeninfo arcfb_fix __initdata = { | |||
| 90 | .accel = FB_ACCEL_NONE, | 90 | .accel = FB_ACCEL_NONE, |
| 91 | }; | 91 | }; |
| 92 | 92 | ||
| 93 | static struct fb_var_screeninfo arcfb_var __initdata = { | 93 | static struct fb_var_screeninfo arcfb_var __devinitdata = { |
| 94 | .xres = 128, | 94 | .xres = 128, |
| 95 | .yres = 64, | 95 | .yres = 64, |
| 96 | .xres_virtual = 128, | 96 | .xres_virtual = 128, |
| @@ -588,7 +588,7 @@ err: | |||
| 588 | return retval; | 588 | return retval; |
| 589 | } | 589 | } |
| 590 | 590 | ||
| 591 | static int arcfb_remove(struct platform_device *dev) | 591 | static int __devexit arcfb_remove(struct platform_device *dev) |
| 592 | { | 592 | { |
| 593 | struct fb_info *info = platform_get_drvdata(dev); | 593 | struct fb_info *info = platform_get_drvdata(dev); |
| 594 | 594 | ||
| @@ -602,7 +602,7 @@ static int arcfb_remove(struct platform_device *dev) | |||
| 602 | 602 | ||
| 603 | static struct platform_driver arcfb_driver = { | 603 | static struct platform_driver arcfb_driver = { |
| 604 | .probe = arcfb_probe, | 604 | .probe = arcfb_probe, |
| 605 | .remove = arcfb_remove, | 605 | .remove = __devexit_p(arcfb_remove), |
| 606 | .driver = { | 606 | .driver = { |
| 607 | .name = "arcfb", | 607 | .name = "arcfb", |
| 608 | }, | 608 | }, |
