Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e3b0970 authored by Lee Jones's avatar Lee Jones
Browse files

backlight: jornada720: Minimise code duplication and handle errors better 



Rickard Strandqvi's ran a code analysis application which found that
jornada_lcd_get_contrast(() and jornada_lcd_set_contrast() contained
some code duplication (calling the same functions during various
code execution paths) and failed to return errors in a consistent
manner.  This patch aims to simplify the code, coercing it into
behaving at a level expected of a driver in the Linux kernel.

Suggested-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Reviewed-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b3de3402

drivers/video/backlight/jornada720_lcd.c

+19 −18
Original line number Diff line number Diff line
@@ -43,37 +43,38 @@ static int jornada_lcd_get_contrast(struct lcd_device *ld) 


	jornada_ssp_start();



	if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) {

		dev_err(&ld->dev, "get contrast failed\n");

		jornada_ssp_end();

		return -ETIMEDOUT;

	} else {

	if (jornada_ssp_byte(GETCONTRAST) == TXDUMMY) {

		ret = jornada_ssp_byte(TXDUMMY);

		goto success;

	}



	dev_err(&ld->dev, "failed to set contrast\n");

	ret = -ETIMEDOUT;



success:

	jornada_ssp_end();

	return ret;

}

}



static int jornada_lcd_set_contrast(struct lcd_device *ld, int value)

{

	int ret;

	int ret = 0;



	jornada_ssp_start();



	/* start by sending our set contrast cmd to mcu */

	ret = jornada_ssp_byte(SETCONTRAST);



	/* push the new value */

	if (jornada_ssp_byte(value) != TXDUMMY) {

		dev_err(&ld->dev, "set contrast failed\n");

		jornada_ssp_end();

		return -ETIMEDOUT;

	if (jornada_ssp_byte(SETCONTRAST) == TXDUMMY) {

		/* if successful push the new value */

		if (jornada_ssp_byte(value) == TXDUMMY)

			goto success;

	}



	/* if we get here we can assume everything went well */

	jornada_ssp_end();

	dev_err(&ld->dev, "failed to set contrast\n");

	ret = -ETIMEDOUT;



	return 0;

success:

	jornada_ssp_end();

	return ret;

}



static int jornada_lcd_set_power(struct lcd_device *ld, int power)