From: Kim, Milo Date: Fri, 22 Feb 2013 00:44:07 +0000 (-0800) Subject: backlight: lp855x_bl: simplify bl_get_brightness() X-Git-Tag: MMI-PSA29.97-13-9~14988^2~55 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e9cdc89695d04359e2d67521199156549c12eb4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git backlight: lp855x_bl: simplify bl_get_brightness() Getting the brightness value is not critical, no need to read the actual register value. To simplify it, just return the 'bl->props.brightness' value. Then, lp855x_read_byte() can be removed, not used any more. Signed-off-by: Milo(Woogyom) Kim Acked-by: Jingoo Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c index edd2041b1527..7ae9ae6f4655 100644 --- a/drivers/video/backlight/lp855x_bl.c +++ b/drivers/video/backlight/lp855x_bl.c @@ -66,20 +66,6 @@ struct lp855x { struct pwm_device *pwm; }; -static int lp855x_read_byte(struct lp855x *lp, u8 reg, u8 *data) -{ - int ret; - - ret = i2c_smbus_read_byte_data(lp->client, reg); - if (ret < 0) { - dev_err(lp->dev, "failed to read 0x%.2x\n", reg); - return ret; - } - - *data = (u8)ret; - return 0; -} - static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data) { return i2c_smbus_write_byte_data(lp->client, reg, data); @@ -274,16 +260,6 @@ static int lp855x_bl_update_status(struct backlight_device *bl) static int lp855x_bl_get_brightness(struct backlight_device *bl) { - struct lp855x *lp = bl_get_data(bl); - enum lp855x_brightness_ctrl_mode mode = lp->pdata->mode; - - if (mode == REGISTER_BASED) { - u8 val = 0; - - lp855x_read_byte(lp, lp->cfg->reg_brightness, &val); - bl->props.brightness = val; - } - return bl->props.brightness; }