Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Hans de Goede and committed by
Lee Jones
92add941 dec5779e

+13 -16
+13 -16
drivers/video/backlight/lp855x_bl.c
··· 381 381 382 382 static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) 383 383 { 384 + struct device *dev = &cl->dev; 384 385 struct lp855x *lp; 385 386 int ret; 386 387 387 388 if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) 388 389 return -EIO; 389 390 390 - lp = devm_kzalloc(&cl->dev, sizeof(struct lp855x), GFP_KERNEL); 391 + lp = devm_kzalloc(dev, sizeof(struct lp855x), GFP_KERNEL); 391 392 if (!lp) 392 393 return -ENOMEM; 393 394 394 395 lp->client = cl; 395 - lp->dev = &cl->dev; 396 + lp->dev = dev; 396 397 lp->chipname = id->name; 397 398 lp->chip_id = id->driver_data; 398 - lp->pdata = dev_get_platdata(&cl->dev); 399 + lp->pdata = dev_get_platdata(dev); 399 400 400 401 switch (lp->chip_id) { 401 402 case LP8550: ··· 425 424 else 426 425 lp->mode = REGISTER_BASED; 427 426 428 - lp->supply = devm_regulator_get(lp->dev, "power"); 427 + lp->supply = devm_regulator_get(dev, "power"); 429 428 if (IS_ERR(lp->supply)) { 430 429 if (PTR_ERR(lp->supply) == -EPROBE_DEFER) 431 430 return -EPROBE_DEFER; 432 431 lp->supply = NULL; 433 432 } 434 433 435 - lp->enable = devm_regulator_get_optional(lp->dev, "enable"); 434 + lp->enable = devm_regulator_get_optional(dev, "enable"); 436 435 if (IS_ERR(lp->enable)) { 437 436 ret = PTR_ERR(lp->enable); 438 437 if (ret == -ENODEV) { 439 438 lp->enable = NULL; 440 439 } else { 441 - if (ret != -EPROBE_DEFER) 442 - dev_err(lp->dev, "error getting enable regulator: %d\n", 443 - ret); 444 - return ret; 440 + return dev_err_probe(dev, ret, "getting enable regulator\n"); 445 441 } 446 442 } 447 443 448 444 if (lp->supply) { 449 445 ret = regulator_enable(lp->supply); 450 446 if (ret < 0) { 451 - dev_err(&cl->dev, "failed to enable supply: %d\n", ret); 447 + dev_err(dev, "failed to enable supply: %d\n", ret); 452 448 return ret; 453 449 } 454 450 } ··· 453 455 if (lp->enable) { 454 456 ret = regulator_enable(lp->enable); 455 457 if (ret < 0) { 456 - dev_err(lp->dev, "failed to enable vddio: %d\n", ret); 458 + dev_err(dev, "failed to enable vddio: %d\n", ret); 457 459 goto disable_supply; 458 460 } 459 461 ··· 468 470 469 471 ret = lp855x_configure(lp); 470 472 if (ret) { 471 - dev_err(lp->dev, "device config err: %d", ret); 473 + dev_err(dev, "device config err: %d", ret); 472 474 goto disable_vddio; 473 475 } 474 476 475 477 ret = lp855x_backlight_register(lp); 476 478 if (ret) { 477 - dev_err(lp->dev, 478 - "failed to register backlight. err: %d\n", ret); 479 + dev_err(dev, "failed to register backlight. err: %d\n", ret); 479 480 goto disable_vddio; 480 481 } 481 482 482 - ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group); 483 + ret = sysfs_create_group(&dev->kobj, &lp855x_attr_group); 483 484 if (ret) { 484 - dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret); 485 + dev_err(dev, "failed to register sysfs. err: %d\n", ret); 485 486 goto disable_vddio; 486 487 } 487 488