Variable ar assigned a value that is never used. I have also removed all the code that thereby serves no purpose, and made same change to clarify the similarities in function.
This was found using a static code analysis program called cppcheck Signed-off-by: Rickard Strandqvist <[email protected]> --- drivers/video/backlight/jornada720_lcd.c | 31 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c index da3876c..d16abcf 100644 --- a/drivers/video/backlight/jornada720_lcd.c +++ b/drivers/video/backlight/jornada720_lcd.c @@ -36,44 +36,41 @@ static int jornada_lcd_get_power(struct lcd_device *ld) static int jornada_lcd_get_contrast(struct lcd_device *ld) { - int ret; + int ret = -ETIMEDOUT; if (jornada_lcd_get_power(ld) != FB_BLANK_UNBLANK) return 0; jornada_ssp_start(); - if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) { + if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) dev_err(&ld->dev, "get contrast failed\n"); - jornada_ssp_end(); - return -ETIMEDOUT; - } else { + else ret = jornada_ssp_byte(TXDUMMY); - jornada_ssp_end(); - return ret; - } + + jornada_ssp_end(); + + return ret; } static int jornada_lcd_set_contrast(struct lcd_device *ld, int value) { - int ret; + int ret = -ETIMEDOUT; jornada_ssp_start(); /* start by sending our set contrast cmd to mcu */ - ret = jornada_ssp_byte(SETCONTRAST); - + if (jornada_ssp_byte(SETCONTRAST) != TXDUMMY) + dev_err(&ld->dev, "set contrast failed\n"); /* push the new value */ - if (jornada_ssp_byte(value) != TXDUMMY) { + else if (jornada_ssp_byte(value) != TXDUMMY) dev_err(&ld->dev, "set contrast failed\n"); - jornada_ssp_end(); - return -ETIMEDOUT; - } + else /* if we get here we can assume everything went well */ + ret = 0; - /* if we get here we can assume everything went well */ jornada_ssp_end(); - return 0; + return ret; } static int jornada_lcd_set_power(struct lcd_device *ld, int power) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
