backlight: lm3630a: Don't set bl->props.brightness in get_brightness

There's no need to set bl->props.brightness, the get_brightness function
is just supposed to return the current brightness and not touch the
struct.

With that done we can also remove the 'goto out' and just return the
value.

Fixes: 0c2a665a648e ("backlight: add Backlight driver for lm3630 chip")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Link: https://lore.kernel.org/r/20240220-lm3630a-fixups-v1-2-9ca62f7e4a33@z3ntu.xyz
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c
index 8e27527..26ff417 100644 (file)
--- a/drivers/video/backlight/lm3630a_bl.c
+++ b/drivers/video/backlight/lm3630a_bl.c
@@ -233,7 +233,7 @@ static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
                if (rval < 0)
                        goto out_i2c_err;
                brightness |= rval;
-               goto out;
+               return brightness;
        }
 
        /* disable sleep */
@@ -244,11 +244,8 @@ static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
        rval = lm3630a_read(pchip, REG_BRT_A);
        if (rval < 0)
                goto out_i2c_err;
-       brightness = rval;
+       return rval;
 
-out:
-       bl->props.brightness = brightness;
-       return bl->props.brightness;
 out_i2c_err:
        dev_err(pchip->dev, "i2c failed to access register\n");
        return 0;
@@ -310,7 +307,7 @@ static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)
                if (rval < 0)
                        goto out_i2c_err;
                brightness |= rval;
-               goto out;
+               return brightness;
        }
 
        /* disable sleep */
@@ -321,11 +318,8 @@ static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)
        rval = lm3630a_read(pchip, REG_BRT_B);
        if (rval < 0)
                goto out_i2c_err;
-       brightness = rval;
+       return rval;
 
-out:
-       bl->props.brightness = brightness;
-       return bl->props.brightness;
 out_i2c_err:
        dev_err(pchip->dev, "i2c failed to access register\n");
        return 0;