[PATCH] video: fbdev: make fb_var_screeninfo static, const and __initconst

[PATCH] video: fbdev: make fb_var_screeninfo static, const and __initconst

[Bhumika Goyal]

Make these structures static as they are not referenced in any other
file. Make them const as they are used only during a copy operation.
Replace __initdata with __initconst in file igafb.c to avoid section
conflict error.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
---
The changes are not compile tested as I could not find the right 
architecture to cross compile the files.

 drivers/video/fbdev/dnfb.c  | 2 +-
 drivers/video/fbdev/igafb.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/dnfb.c b/drivers/video/fbdev/dnfb.c
index 7b1492d..0941500 100644
--- a/drivers/video/fbdev/dnfb.c
+++ b/drivers/video/fbdev/dnfb.c
@@ -115,7 +115,7 @@
 	.fb_imageblit	= cfb_imageblit,
 };
 
-struct fb_var_screeninfo dnfb_var = {
+static const struct fb_var_screeninfo dnfb_var = {
 	.xres		= 1280,
 	.yres		= 1024,
 	.xres_virtual	= 2048,
diff --git a/drivers/video/fbdev/igafb.c b/drivers/video/fbdev/igafb.c
index 486f188..607b6c0 100644
--- a/drivers/video/fbdev/igafb.c
+++ b/drivers/video/fbdev/igafb.c
@@ -97,7 +97,7 @@ struct fb_var_screeninfo default_var = {
 };
 
 #ifdef CONFIG_SPARC
-struct fb_var_screeninfo default_var_1024x768 __initdata = {
+static const struct fb_var_screeninfo default_var_1024x768 __initconst = {
 	/* 1024x768, 75 Hz, Non-Interlaced (78.75 MHz dotclock) */
 	.xres		= 1024,
 	.yres		= 768,
@@ -120,7 +120,7 @@ struct fb_var_screeninfo default_var_1024x768 __initdata = {
 	.vmode		= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
 };
 
-struct fb_var_screeninfo default_var_1152x900 __initdata = {
+static const struct fb_var_screeninfo default_var_1152x900 __initconst = {
 	/* 1152x900, 76 Hz, Non-Interlaced (110.0 MHz dotclock) */
 	.xres		= 1152,
 	.yres		= 900,
@@ -143,7 +143,7 @@ struct fb_var_screeninfo default_var_1152x900 __initdata = {
 	.vmode		= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
 };
 
-struct fb_var_screeninfo default_var_1280x1024 __initdata = {
+static const struct fb_var_screeninfo default_var_1280x1024 __initconst = {
 	/* 1280x1024, 75 Hz, Non-Interlaced (135.00 MHz dotclock) */
 	.xres		= 1280,
 	.yres		= 1024,
-- 
1.9.1

Re: [PATCH] video: fbdev: make fb_var_screeninfo static, const and __initconst

[Bartlomiej Zolnierkiewicz]

[ added dri-devel & sparclinux MLs to cc: ]

On Thursday, September 14, 2017 06:02:14 PM Bhumika Goyal wrote:
> Make these structures static as they are not referenced in any other
> file. Make them const as they are used only during a copy operation.
> Replace __initdata with __initconst in file igafb.c to avoid section
> conflict error.
> 
> Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
> ---
> The changes are not compile tested as I could not find the right 
> architecture to cross compile the files.
> 
>  drivers/video/fbdev/dnfb.c  | 2 +-
>  drivers/video/fbdev/igafb.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

You can deduce such things by looking into Makefile-s and KConfig-s:
- dnfb is used by apollo platform of m68k arch
- igafb can be used on sparc32 arch

I took care of compile testing these changes and discovered that
in the current vanilla kernel (v4.14-rc4) igafb fails to build.

Thus I've only queued dnfb changes for v4.15 kernel for now.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics