These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / video / backlight / lp855x_bl.c

diff --git a/kernel/drivers/video/backlight/lp855x_bl.c b/kernel/drivers/video/backlight/lp855x_bl.c
index a26d3bb..daca9e6 100644 (file)
--- a/kernel/drivers/video/backlight/lp855x_bl.c
+++ b/kernel/drivers/video/backlight/lp855x_bl.c
@@ -73,6 +73,7 @@ struct lp855x {
        struct device *dev;
        struct lp855x_platform_data *pdata;
        struct pwm_device *pwm;
+       struct regulator *supply;       /* regulator for VDD input */
 };
 
 static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data)
@@ -257,21 +258,15 @@ static void lp855x_pwm_ctrl(struct lp855x *lp, int br, int max_br)
 static int lp855x_bl_update_status(struct backlight_device *bl)
 {
        struct lp855x *lp = bl_get_data(bl);
+       int brightness = bl->props.brightness;
 
        if (bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
-               bl->props.brightness = 0;
+               brightness = 0;
 
-       if (lp->mode == PWM_BASED) {
-               int br = bl->props.brightness;
-               int max_br = bl->props.max_brightness;
-
-               lp855x_pwm_ctrl(lp, br, max_br);
-
-       } else if (lp->mode == REGISTER_BASED) {
-               u8 val = bl->props.brightness;
-
-               lp855x_write_byte(lp, lp->cfg->reg_brightness, val);
-       }
+       if (lp->mode == PWM_BASED)
+               lp855x_pwm_ctrl(lp, brightness, bl->props.max_brightness);
+       else if (lp->mode == REGISTER_BASED)
+               lp855x_write_byte(lp, lp->cfg->reg_brightness, (u8)brightness);
 
        return 0;
 }
@@ -288,6 +283,7 @@ static int lp855x_backlight_register(struct lp855x *lp)
        struct lp855x_platform_data *pdata = lp->pdata;
        const char *name = pdata->name ? : DEFAULT_BL_NAME;
 
+       memset(&props, 0, sizeof(props));
        props.type = BACKLIGHT_PLATFORM;
        props.max_brightness = MAX_BRIGHTNESS;
 
@@ -384,13 +380,6 @@ static int lp855x_parse_dt(struct lp855x *lp)
                pdata->rom_data = &rom[0];
        }
 
-       pdata->supply = devm_regulator_get(dev, "power");
-       if (IS_ERR(pdata->supply)) {
-               if (PTR_ERR(pdata->supply) == -EPROBE_DEFER)
-                       return -EPROBE_DEFER;
-               pdata->supply = NULL;
-       }
-
        lp->pdata = pdata;
 
        return 0;
@@ -431,8 +420,15 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        else
                lp->mode = REGISTER_BASED;
 
-       if (lp->pdata->supply) {
-               ret = regulator_enable(lp->pdata->supply);
+       lp->supply = devm_regulator_get(lp->dev, "power");
+       if (IS_ERR(lp->supply)) {
+               if (PTR_ERR(lp->supply) == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               lp->supply = NULL;
+       }
+
+       if (lp->supply) {
+               ret = regulator_enable(lp->supply);
                if (ret < 0) {
                        dev_err(&cl->dev, "failed to enable supply: %d\n", ret);
                        return ret;
@@ -470,8 +466,8 @@ static int lp855x_remove(struct i2c_client *cl)
 
        lp->bl->props.brightness = 0;
        backlight_update_status(lp->bl);
-       if (lp->pdata->supply)
-               regulator_disable(lp->pdata->supply);
+       if (lp->supply)
+               regulator_disable(lp->supply);
        sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
 
        return 0;