Re: linux-next: build warning after merge of the fbdev tree

Laurent Pinchart
2011-12-20T10:37:50Z

Hi Stephen,

On Tuesday 20 December 2011 06:32:14 Stephen Rothwell wrote:
> Hi all,
>
> After merging the fbdev tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> drivers/video/matrox/matroxfb_base.c:150:2: warning: braces around scalar
> initializer [enabled by default]
> drivers/video/matrox/matroxfb_base.c:150:2: warning: (near initialization
> for 'vesafb_defined.colorspace') [enabled by default]
> drivers/video/matrox/matroxfb_base.c:150:2: warning: excess elements in
> scalar initializer [enabled by default]
> drivers/video/matrox/matroxfb_base.c:150:2: warning: (near initialization
> for 'vesafb_defined.colorspace') [enabled by default]
> drivers/video/matrox/matroxfb_crtc2.c:596:3: warning: braces around scalar
> initializer [enabled by default]
> drivers/video/matrox/matroxfb_crtc2.c:596:3: warning: (near initialization
> for 'matroxfb_dh_defined.colorspace') [enabled by default]
> drivers/video/matrox/matroxfb_crtc2.c:596:3: warning: excess elements in
> scalar initializer [enabled by default]
> drivers/video/matrox/matroxfb_crtc2.c:596:3: warning: (near initialization
> for 'matroxfb_dh_defined.colorspace') [enabled by default]
>
> Introduced by commit fb21c2f42879 ("fbdev: Add FOURCC-based format
> configuration API").

The following patch should fix the issue. Florian, are you fine with it, or
would you rather modify the initializers to be name-based ?

>From 078987fc14dba806fc1bc628e3e5c371db3cf1b8 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 20 Dec 2011 11:30:53 +0100
Subject: [PATCH] fbdev: matroxfb: Fix compilation after fb_var_screeninfo change

Commit fb21c2f42879 ("fbdev: Add FOURCC-based format configuration API")
modified the layout of the fb_var_screeninfo structure. Update the
static initializers in the matroxfb driver accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/video/matrox/matroxfb_base.c | 2 +-
drivers/video/matrox/matroxfb_crtc2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 44bf8d4..f98aad5 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -147,7 +147,7 @@ static struct fb_var_screeninfo vesafb_defined = {
39721L,48L,16L,33L,10L,
96L,2L,~0, /* No sync info */
FB_VMODE_NONINTERLACED,
- 0, {0,0,0,0,0}
+ 0, 0, {0,0,0,0}
};

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index d7112c3..d0c1abc 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -593,7 +593,7 @@ static struct fb_var_screeninfo matroxfb_dh_defined = {
39721L,48L,16L,33L,10L,
96L,2,0, /* no sync info */
FB_VMODE_NONINTERLACED,
- 0, {0,0,0,0,0}
+ 0, 0, {0,0,0,0}
};

static int matroxfb_dh_regit(const struct matrox_fb_info *minfo,
--
Regards,

Laurent Pinchart