2010-01-15 16:51:30

by Mark Brown

Subject: [PATCH] s3c-fb: Fix mixed code and variable declaration

Hoist osdc_data up into the variable declaration section.

Reported-by: Andrew Morton <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/video/s3c-fb.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index e2e7afd..58e2fed 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -269,6 +269,7 @@ static int s3c_fb_set_par(struct fb_info *info)
int win_no = win->index;
u32 data;
u32 pagewidth;
+ u32 osdc_data;
int clkdiv;

dev_dbg(sfb->dev, "setting framebuffer parameters\n");
@@ -359,8 +360,6 @@ static int s3c_fb_set_par(struct fb_info *info)

data = var->xres * var->yres;

- u32 osdc_data = 0;
-
osdc_data = VIDISD14C_ALPHA1_R(0xf) |
VIDISD14C_ALPHA1_G(0xf) |
VIDISD14C_ALPHA1_B(0xf);
--
1.6.6

2010-01-16 02:34:49

by Ben Dooks

Subject: Re: [PATCH] s3c-fb: Fix mixed code and variable declaration

On Fri, Jan 15, 2010 at 04:51:26PM +0000, Mark Brown wrote:
> Hoist osdc_data up into the variable declaration section.
>
> Reported-by: Andrew Morton <[email protected]>
> Signed-off-by: Mark Brown <[email protected]>
Acked-by: Ben Dooks <[email protected]>
> ---
> drivers/video/s3c-fb.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
> index e2e7afd..58e2fed 100644
> --- a/drivers/video/s3c-fb.c
> +++ b/drivers/video/s3c-fb.c
> @@ -269,6 +269,7 @@ static int s3c_fb_set_par(struct fb_info *info)
> int win_no = win->index;
> u32 data;
> u32 pagewidth;
> + u32 osdc_data;
> int clkdiv;
>
> dev_dbg(sfb->dev, "setting framebuffer parameters\n");
> @@ -359,8 +360,6 @@ static int s3c_fb_set_par(struct fb_info *info)
>
> data = var->xres * var->yres;
>
> - u32 osdc_data = 0;
> -
> osdc_data = VIDISD14C_ALPHA1_R(0xf) |
> VIDISD14C_ALPHA1_G(0xf) |
> VIDISD14C_ALPHA1_B(0xf);
> --
> 1.6.6
>

--
--
Ben

Q: What's a light-year?
A: One-third less calories than a regular year.