backlight: lp855x: Add dev helper variable to lp855x_probe()

Add a dev local variable to the lp855x_probe(), to replace "&cl->dev"
and "lp->dev" in various places.

Also switch to dev_err_probe() in one case which takes care of not
printing -EPROBE_DEFER errors for us.

This is mostly a preparation for adding ACPI enumeration support which
will use the new "dev" variable more.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211102225504.18920-2-hdegoede@redhat.com

diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 808ff00..d1d27d5 100644 (file)
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -381,21 +381,22 @@ static int lp855x_parse_dt(struct lp855x *lp)
 
 static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 {
+       struct device *dev = &cl->dev;
        struct lp855x *lp;
        int ret;
 
        if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
                return -EIO;
 
-       lp = devm_kzalloc(&cl->dev, sizeof(struct lp855x), GFP_KERNEL);
+       lp = devm_kzalloc(dev, sizeof(struct lp855x), GFP_KERNEL);
        if (!lp)
                return -ENOMEM;
 
        lp->client = cl;
-       lp->dev = &cl->dev;
+       lp->dev = dev;
        lp->chipname = id->name;
        lp->chip_id = id->driver_data;
-       lp->pdata = dev_get_platdata(&cl->dev);
+       lp->pdata = dev_get_platdata(dev);
 
        switch (lp->chip_id) {
        case LP8550:
@@ -424,30 +425,27 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        else
                lp->mode = REGISTER_BASED;
 
-       lp->supply = devm_regulator_get(lp->dev, "power");
+       lp->supply = devm_regulator_get(dev, "power");
        if (IS_ERR(lp->supply)) {
                if (PTR_ERR(lp->supply) == -EPROBE_DEFER)
                        return -EPROBE_DEFER;
                lp->supply = NULL;
        }
 
-       lp->enable = devm_regulator_get_optional(lp->dev, "enable");
+       lp->enable = devm_regulator_get_optional(dev, "enable");
        if (IS_ERR(lp->enable)) {
                ret = PTR_ERR(lp->enable);
                if (ret == -ENODEV) {
                        lp->enable = NULL;
                } else {
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(lp->dev, "error getting enable regulator: %d\n",
-                                       ret);
-                       return ret;
+                       return dev_err_probe(dev, ret, "getting enable regulator\n");
                }
        }
 
        if (lp->supply) {
                ret = regulator_enable(lp->supply);
                if (ret < 0) {
-                       dev_err(&cl->dev, "failed to enable supply: %d\n", ret);
+                       dev_err(dev, "failed to enable supply: %d\n", ret);
                        return ret;
                }
        }
@@ -455,7 +453,7 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
        if (lp->enable) {
                ret = regulator_enable(lp->enable);
                if (ret < 0) {
-                       dev_err(lp->dev, "failed to enable vddio: %d\n", ret);
+                       dev_err(dev, "failed to enable vddio: %d\n", ret);
                        goto disable_supply;
                }
 
@@ -470,20 +468,19 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 
        ret = lp855x_configure(lp);
        if (ret) {
-               dev_err(lp->dev, "device config err: %d", ret);
+               dev_err(dev, "device config err: %d", ret);
                goto disable_vddio;
        }
 
        ret = lp855x_backlight_register(lp);
        if (ret) {
-               dev_err(lp->dev,
-                       "failed to register backlight. err: %d\n", ret);
+               dev_err(dev, "failed to register backlight. err: %d\n", ret);
                goto disable_vddio;
        }
 
-       ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
+       ret = sysfs_create_group(&dev->kobj, &lp855x_attr_group);
        if (ret) {
-               dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
+               dev_err(dev, "failed to register sysfs. err: %d\n", ret);
                goto disable_vddio;
        }