2014-07-05 12:12:00

by Rickard Strandqvist

Subject: [PATCH] video: fbdev: amifb.c: Cleaning up variable that is never used

From: Rickard Strandqvist <[email protected]>

Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.

This was found using a static code analysis program called cppcheck

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/video/fbdev/amifb.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
index 518f790..19ed1fa 100644
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -1124,7 +1124,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
{
u_short clk_shift, line_shift;
u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
- u_int htotal, vtotal;

/*
* Find a matching Pixel Clock
@@ -1270,8 +1269,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
DPRINTK("diwstrt_v too low for pal\n");
return -EINVAL;
}
- htotal = PAL_HTOTAL>>clk_shift;
- vtotal = PAL_VTOTAL>>1;
if (!IS_OCS) {
par->beamcon0 = BMC0_PAL;
par->bplcon3 |= BPC3_BRDRBLNK;
@@ -1300,8 +1297,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
DPRINTK("diwstrt_v too low for ntsc\n");
return -EINVAL;
}
- htotal = NTSC_HTOTAL>>clk_shift;
- vtotal = NTSC_VTOTAL>>1;
if (!IS_OCS) {
par->beamcon0 = 0;
par->bplcon3 |= BPC3_BRDRBLNK;
@@ -1360,8 +1355,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
par->beamcon0 |= BMC0_VSYTRUE;
if (var->sync & FB_SYNC_COMP_HIGH_ACT)
par->beamcon0 |= BMC0_CSYTRUE;
- htotal = par->htotal>>clk_shift;
- vtotal = par->vtotal>>1;
} else {
DPRINTK("only broadcast modes possible for ocs\n");
return -EINVAL;
@@ -1847,10 +1840,9 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var,
register short delta;
register u_char color;
short height, width, bits, words;
- int size, alloc;
+ int size;

size = par->crsr.height * par->crsr.width;
- alloc = var->height * var->width;
var->height = par->crsr.height;
var->width = par->crsr.width;
var->xspot = par->crsr.spot_x;
--
1.7.10.4

2014-07-05 14:04:26

by Geert Uytterhoeven

Subject: Re: [PATCH] video: fbdev: amifb.c: Cleaning up variable that is never used

On Sat, Jul 5, 2014 at 2:13 PM, Rickard Strandqvist
<[email protected]> wrote:
> From: Rickard Strandqvist <[email protected]>
>
> Variable ar assigned a value that is never used.
> I have also removed all the code that thereby serves no purpose.
>
> This was found using a static code analysis program called cppcheck
>
> Signed-off-by: Rickard Strandqvist <[email protected]>

Acked-by: Geert Uytterhoeven <[email protected]>

> --- a/drivers/video/fbdev/amifb.c
> +++ b/drivers/video/fbdev/amifb.c
> @@ -1124,7 +1124,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
> {
> u_short clk_shift, line_shift;
> u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
> - u_int htotal, vtotal;

These became unused by commit 3161986224a3faa8ccca3e665b7404d81e7ee3cf
Author: Geert Uytterhoeven <[email protected]>
Date: Wed Dec 13 00:35:54 2006 -0800

[PATCH] fbdev: remove references to non-existent fbmon_valid_timings()

Remove references to non-existent fbmon_valid_timings()

Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: James Simmons <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds