* [PATCH 3/7] fbdev: section cleanup in hgafb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
@ 2010-03-27 6:29 ` Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 4/7] fbdev: section cleanup in vesafb Henrik Kretzschmar
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Henrik Kretzschmar @ 2010-03-27 6:29 UTC (permalink / raw)
To: linux-fbdev
Cc: Henrik Kretzschmar, Ferenc Bakonyi, Arnaud Patard,
Uwe Kleine-König, Jaya Kumar, James Simmons, linux-nvidia,
linux-kernel
This patch cleans up the sections in the hgafb driver.
WARNING: drivers/video/hgafb.o(.devinit.text+0x18): Section mismatch in referenc
e from the function hgafb_probe() to the function .init.text:hga_card_detect()
The function __devinit hgafb_probe() references
a function __init hga_card_detect().
If hga_card_detect is only used by hgafb_probe then
annotate hga_card_detect with a matching annotation.
WARNING: drivers/video/hgafb.o(.devinit.text+0xfe): Section mismatch in referenc
e from the function hgafb_probe() to the variable .init.data:hga_fix
The function __devinit hgafb_probe() references
a variable __initdata hga_fix.
If hga_fix is only used by hgafb_probe then
annotate hga_fix with a matching annotation.
WARNING: drivers/video/hgafb.o(.devinit.text+0x105): Section mismatch in reference from the function hgafb_probe() to the variable .init.data:hga_default_var
The function __devinit hgafb_probe() references
a variable __initdata hga_default_var.
If hga_default_var is only used by hgafb_probe then
annotate hga_default_var with a matching annotation.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
drivers/video/hgafb.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index db9b785..234a6a5 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -107,7 +107,7 @@ static DEFINE_SPINLOCK(hga_reg_lock);
/* Framebuffer driver structures */
-static struct fb_var_screeninfo __initdata hga_default_var = {
+static struct fb_var_screeninfo hga_default_var __devinitdata = {
.xres = 720,
.yres = 348,
.xres_virtual = 720,
@@ -121,7 +121,7 @@ static struct fb_var_screeninfo __initdata hga_default_var = {
.width = -1,
};
-static struct fb_fix_screeninfo __initdata hga_fix = {
+static struct fb_fix_screeninfo hga_fix __devinitdata = {
.id = "HGA",
.type = FB_TYPE_PACKED_PIXELS, /* (not sure) */
.visual = FB_VISUAL_MONO10,
@@ -277,7 +277,7 @@ static void hga_blank(int blank_mode)
spin_unlock_irqrestore(&hga_reg_lock, flags);
}
-static int __init hga_card_detect(void)
+static int __devinit hga_card_detect(void)
{
int count = 0;
void __iomem *p, *q;
@@ -597,7 +597,7 @@ static int __devinit hgafb_probe(struct platform_device *pdev)
return 0;
}
-static int hgafb_remove(struct platform_device *pdev)
+static int __devexit hgafb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
@@ -622,7 +622,7 @@ static int hgafb_remove(struct platform_device *pdev)
static struct platform_driver hgafb_driver = {
.probe = hgafb_probe,
- .remove = hgafb_remove,
+ .remove = __devexit_p(hgafb_remove),
.driver = {
.name = "hgafb",
},
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/7] fbdev: section cleanup in vesafb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 3/7] fbdev: section cleanup in hgafb Henrik Kretzschmar
@ 2010-03-27 6:29 ` Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 5/7] fbdev: section cleanup in vfb Henrik Kretzschmar
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Henrik Kretzschmar @ 2010-03-27 6:29 UTC (permalink / raw)
To: linux-fbdev
Cc: Henrik Kretzschmar, Andrew Morton, Peter Jones, Arnaud Patard,
Jaya Kumar, Greg Kroah-Hartman, linux-kernel
This patch cleans up the sections in the vesafb driver.
WARNING: drivers/video/built-in.o(.devinit.text+0x19495): Section mismatch in reference from the function vesafb_probe() to the variable .init.data:vesafb_fix
The function __devinit vesafb_probe() references
a variable __initdata vesafb_fix.
If vesafb_fix is only used by vesafb_probe then
annotate vesafb_fix with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x194a5): Section mismatch in reference from the function vesafb_probe() to the (unknown reference) .init.data:(unknown)
The function __devinit vesafb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by vesafb_probe then
annotate (unknown) with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x194d5): Section mismatch in reference from the function vesafb_probe() to the variable .init.data:vesafb_defined
The function __devinit vesafb_probe() references
a variable __initdata vesafb_defined.
If vesafb_defined is only used by vesafb_probe then
annotate vesafb_defined with a matching annotation.
...
fbdev: section cleanup in vesafb
This patch cleans up the sections in the vesafb driver.
WARNING: drivers/video/built-in.o(.devinit.text+0x19495): Section mismatch in reference from the function vesafb_probe() to the variable .init.data:vesafb_fix
The function __devinit vesafb_probe() references
a variable __initdata vesafb_fix.
If vesafb_fix is only used by vesafb_probe then
annotate vesafb_fix with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x194a5): Section mismatch in reference from the function vesafb_probe() to the (unknown reference) .init.data:(unknown)
The function __devinit vesafb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by vesafb_probe then
annotate (unknown) with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x194d5): Section mismatch in reference from the function vesafb_probe() to the variable .init.data:vesafb_defined
The function __devinit vesafb_probe() references
a variable __initdata vesafb_defined.
If vesafb_defined is only used by vesafb_probe then
annotate vesafb_defined with a matching annotation.
...
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
drivers/video/vesafb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index ef4128c..ba8e394 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -30,7 +30,7 @@
/* --------------------------------------------------------------------- */
-static struct fb_var_screeninfo vesafb_defined __initdata = {
+static struct fb_var_screeninfo vesafb_defined __devinitdata = {
.activate = FB_ACTIVATE_NOW,
.height = -1,
.width = -1,
@@ -41,7 +41,7 @@ static struct fb_var_screeninfo vesafb_defined __initdata = {
.vmode = FB_VMODE_NONINTERLACED,
};
-static struct fb_fix_screeninfo vesafb_fix __initdata = {
+static struct fb_fix_screeninfo vesafb_fix __devinitdata = {
.id = "VESA VGA",
.type = FB_TYPE_PACKED_PIXELS,
.accel = FB_ACCEL_NONE,
@@ -49,8 +49,8 @@ static struct fb_fix_screeninfo vesafb_fix __initdata = {
static int inverse __read_mostly;
static int mtrr __read_mostly; /* disable mtrr */
-static int vram_remap __initdata; /* Set amount of memory to be used */
-static int vram_total __initdata; /* Set total amount of memory */
+static int vram_remap __devinitdata; /* Set amount of memory to be used */
+static int vram_total __devinitdata; /* Set total amount of memory */
static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
static void (*pmi_start)(void) __read_mostly;
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/7] fbdev: section cleanup in vfb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 3/7] fbdev: section cleanup in hgafb Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 4/7] fbdev: section cleanup in vesafb Henrik Kretzschmar
@ 2010-03-27 6:29 ` Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 6/7] fbdev: section cleanup in vga16fb Henrik Kretzschmar
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Henrik Kretzschmar @ 2010-03-27 6:29 UTC (permalink / raw)
To: linux-fbdev
Cc: Henrik Kretzschmar, Andrew Morton, Krzysztof Helt, Arnaud Patard,
Andres Salomon, Jaya Kumar, linux-kernel
This patch cleans up the section in the vfb driver.
WARNING: drivers/video/vfb.o(.devinit.text+0xf8): Section mismatch in reference from the function vfb_probe() to the variable .init.data:vfb_default
The function __devinit vfb_probe() references
a variable __initdata vfb_default.
If vfb_default is only used by vfb_probe then
annotate vfb_default with a matching annotation.
WARNING: drivers/video/vfb.o(.devinit.text+0x114): Section mismatch in reference from the function vfb_probe() to the variable .init.data:vfb_fix
The function __devinit vfb_probe() references
a variable __initdata vfb_fix.
If vfb_fix is only used by vfb_probe then
annotate vfb_fix with a matching annotation.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
drivers/video/vfb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index b8ab995..488520b 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -79,7 +79,7 @@ static void rvfree(void *mem, unsigned long size)
vfree(mem);
}
-static struct fb_var_screeninfo vfb_default __initdata = {
+static struct fb_var_screeninfo vfb_default __devinitdata = {
.xres = 640,
.yres = 480,
.xres_virtual = 640,
@@ -101,7 +101,7 @@ static struct fb_var_screeninfo vfb_default __initdata = {
.vmode = FB_VMODE_NONINTERLACED,
};
-static struct fb_fix_screeninfo vfb_fix __initdata = {
+static struct fb_fix_screeninfo vfb_fix __devinitdata = {
.id = "Virtual FB",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR,
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/7] fbdev: section cleanup in vga16fb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
` (2 preceding siblings ...)
2010-03-27 6:29 ` [PATCH 5/7] fbdev: section cleanup in vfb Henrik Kretzschmar
@ 2010-03-27 6:29 ` Henrik Kretzschmar
2010-03-27 6:29 ` [PATCH 7/7] fbdev: section cleanup in w100fb Henrik Kretzschmar
2010-03-29 15:21 ` [PATCH 2/7] fbdev: section cleanup in efifb Peter Jones
5 siblings, 0 replies; 7+ messages in thread
From: Henrik Kretzschmar @ 2010-03-27 6:29 UTC (permalink / raw)
To: linux-fbdev
Cc: Henrik Kretzschmar, Arnaud Patard, Uwe Kleine-König,
Jaya Kumar, James Simmons, linux-kernel
This patch cleans up the sections in the vga16fb driver.
WARNING: drivers/video/built-in.o(.devinit.text+0x1a420): Section mismatch in re
ference from the function vga16fb_probe() to the (unknown reference) .init.data:
(unknown)
The function __devinit vga16fb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by vga16fb_probe then
annotate (unknown) with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x1a437): Section mismatch in reference from the function vga16fb_probe() to the variable .init.data:vga16fb_defined
The function __devinit vga16fb_probe() references
a variable __initdata vga16fb_defined.
If vga16fb_defined is only used by vga16fb_probe then
annotate vga16fb_defined with a matching annotation.
WARNING: drivers/video/built-in.o(.devinit.text+0x1a457): Section mismatch in reference from the function vga16fb_probe() to the variable .init.data:vga16fb_fix
The function __devinit vga16fb_probe() references
a variable __initdata vga16fb_fix.
If vga16fb_fix is only used by vga16fb_probe then
annotate vga16fb_fix with a matching annotation.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
drivers/video/vga16fb.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 76d8dae..b06ea7c 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -66,7 +66,7 @@ struct vga16fb_par {
/* --------------------------------------------------------------------- */
-static struct fb_var_screeninfo vga16fb_defined __initdata = {
+static struct fb_var_screeninfo vga16fb_defined __devinitdata = {
.xres = 640,
.yres = 480,
.xres_virtual = 640,
@@ -86,7 +86,7 @@ static struct fb_var_screeninfo vga16fb_defined __initdata = {
};
/* name should not depend on EGA/VGA */
-static struct fb_fix_screeninfo vga16fb_fix __initdata = {
+static struct fb_fix_screeninfo vga16fb_fix __devinitdata = {
.id = "VGA16 VGA",
.smem_start = VGA_FB_PHYS,
.smem_len = VGA_FB_PHYS_LEN,
@@ -1279,7 +1279,7 @@ static struct fb_ops vga16fb_ops = {
};
#ifndef MODULE
-static int vga16fb_setup(char *options)
+static int __init vga16fb_setup(char *options)
{
char *this_opt;
@@ -1377,7 +1377,7 @@ static int __devinit vga16fb_probe(struct platform_device *dev)
return ret;
}
-static int vga16fb_remove(struct platform_device *dev)
+static int __devexit vga16fb_remove(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
@@ -1394,7 +1394,7 @@ static int vga16fb_remove(struct platform_device *dev)
static struct platform_driver vga16fb_driver = {
.probe = vga16fb_probe,
- .remove = vga16fb_remove,
+ .remove = __devexit_p(vga16fb_remove),
.driver = {
.name = "vga16fb",
},
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 7/7] fbdev: section cleanup in w100fb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
` (3 preceding siblings ...)
2010-03-27 6:29 ` [PATCH 6/7] fbdev: section cleanup in vga16fb Henrik Kretzschmar
@ 2010-03-27 6:29 ` Henrik Kretzschmar
2010-03-29 15:21 ` [PATCH 2/7] fbdev: section cleanup in efifb Peter Jones
5 siblings, 0 replies; 7+ messages in thread
From: Henrik Kretzschmar @ 2010-03-27 6:29 UTC (permalink / raw)
To: linux-fbdev
Cc: Henrik Kretzschmar, Krzysztof Helt, Arnaud Patard, Andrew Morton,
Jaya Kumar, Greg Kroah-Hartman, linux-kernel
This patch cleans up the section in the w100fb driver.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
drivers/video/w100fb.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 5d22395..a37a46c 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -52,7 +52,7 @@ static void w100_update_enable(void);
static void w100_update_disable(void);
static void calc_hsync(struct w100fb_par *par);
static void w100_init_graphic_engine(struct w100fb_par *par);
-struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq) __devinit;
/* Pseudo palette size */
#define MAX_PALETTES 16
@@ -781,7 +781,7 @@ out:
}
-static int w100fb_remove(struct platform_device *pdev)
+static int __devexit w100fb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct w100fb_par *par=info->par;
@@ -1019,7 +1019,7 @@ static struct pll_entries {
{ 0 },
};
-struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
+struct w100_pll_info __devinit *w100_get_xtal_table(unsigned int freq)
{
struct pll_entries *pll_entry = w100_pll_tables;
@@ -1610,7 +1610,7 @@ static void w100_vsync(void)
static struct platform_driver w100fb_driver = {
.probe = w100fb_probe,
- .remove = w100fb_remove,
+ .remove = __devexit_p(w100fb_remove),
.suspend = w100fb_suspend,
.resume = w100fb_resume,
.driver = {
@@ -1618,7 +1618,7 @@ static struct platform_driver w100fb_driver = {
},
};
-int __devinit w100fb_init(void)
+int __init w100fb_init(void)
{
return platform_driver_register(&w100fb_driver);
}
--
1.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/7] fbdev: section cleanup in efifb
2010-03-27 6:29 [PATCH 2/7] fbdev: section cleanup in efifb Henrik Kretzschmar
` (4 preceding siblings ...)
2010-03-27 6:29 ` [PATCH 7/7] fbdev: section cleanup in w100fb Henrik Kretzschmar
@ 2010-03-29 15:21 ` Peter Jones
5 siblings, 0 replies; 7+ messages in thread
From: Peter Jones @ 2010-03-29 15:21 UTC (permalink / raw)
To: Henrik Kretzschmar
Cc: linux-fbdev, Andrew Morton, Alex Zhavnerchik, Huang Ying,
Arnaud Patard, linux-kernel
On 03/27/2010 02:29 AM, Henrik Kretzschmar wrote:
> This patch fixes the sections on the efifb driver.
>
> WARNING: drivers/video/built-in.o(.devinit.text+0x19f8c): Section mismatch in re
> ference from the function efifb_probe() to the (unknown reference) .init.data:(u
> nknown)
> The function __devinit efifb_probe() references
> a (unknown reference) __initdata (unknown).
> If (unknown) is only used by efifb_probe then
> annotate (unknown) with a matching annotation.
>
> WARNING: drivers/video/built-in.o(.devinit.text+0x19f9a): Section mismatch in reference from the function efifb_probe() to the (unknown reference) .init.data:(unknown)
> The function __devinit efifb_probe() references
> a (unknown reference) __initdata (unknown).
> If (unknown) is only used by efifb_probe then
> annotate (unknown) with a matching annotation.
>
> WARNING: drivers/video/built-in.o(.devinit.text+0x19fa1): Section mismatch in reference from the function efifb_probe() to the variable .init.data:efifb_fix
> The function __devinit efifb_probe() references
> a variable __initdata efifb_fix.
> If efifb_fix is only used by efifb_probe then
> annotate efifb_fix with a matching annotation.
>
> WARNING: drivers/video/built-in.o(.devinit.text+0x19fa7): Section mismatch in reference from the function efifb_probe() to the variable .init.data:efifb_defined
> The function __devinit efifb_probe() references
> a variable __initdata efifb_defined.
> If efifb_defined is only used by efifb_probe then
> annotate efifb_defined with a matching annotation.
>
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Acked-by: Peter Jones <pjones@redhat.com>
> ---
> drivers/video/efifb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
> index 581d2db..6aea0d3 100644
> --- a/drivers/video/efifb.c
> +++ b/drivers/video/efifb.c
> @@ -16,7 +16,7 @@
>
> #include <video/vga.h>
>
> -static struct fb_var_screeninfo efifb_defined __initdata = {
> +static struct fb_var_screeninfo efifb_defined __devinitdata = {
> .activate = FB_ACTIVATE_NOW,
> .height = -1,
> .width = -1,
> @@ -27,7 +27,7 @@ static struct fb_var_screeninfo efifb_defined __initdata = {
> .vmode = FB_VMODE_NONINTERLACED,
> };
>
> -static struct fb_fix_screeninfo efifb_fix __initdata = {
> +static struct fb_fix_screeninfo efifb_fix __devinitdata = {
> .id = "EFI VGA",
> .type = FB_TYPE_PACKED_PIXELS,
> .accel = FB_ACCEL_NONE,
--
Peter
Sanity's just a one trick pony anyway. You only get one trick -- rational
thinking -- but when you're good and crazy, the sky's the limit!
-- The Tick
^ permalink raw reply [flat|nested] 7+ messages in thread