renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

leds: lp50xx: Reduce level of dereferences

Browse Source 
The priv->dev is effectively the same as &priv->client->dev.
So, drop the latter for the former.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
This commit is contained in:
Andy Shevchenko 2021-02-16 17:50:46 +02:00 committed by Pavel Machek
parent ea1ff99c9d
commit 556f15fe02
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/leds/leds-lp50xx.c
View File

@ -322,7 +322,7 @@ static int lp50xx_brightness_set(struct led_classdev *cdev,
ret = regmap_write(led->priv->regmap, reg_val, brightness); ret = regmap_write(led->priv->regmap, reg_val, brightness);
if (ret) { if (ret) {
dev_err(&led->priv->client->dev, dev_err(led->priv->dev,
"Cannot write brightness value %d\n", ret); "Cannot write brightness value %d\n", ret);
goto out; goto out;
} }
@ -338,7 +338,7 @@ static int lp50xx_brightness_set(struct led_classdev *cdev,
ret = regmap_write(led->priv->regmap, reg_val, ret = regmap_write(led->priv->regmap, reg_val,
mc_dev->subled_info[i].intensity); mc_dev->subled_info[i].intensity);
if (ret) { if (ret) {
dev_err(&led->priv->client->dev, dev_err(led->priv->dev,
"Cannot write intensity value %d\n", ret); "Cannot write intensity value %d\n", ret);
goto out; goto out;
} }
@ -404,7 +404,7 @@ static int lp50xx_probe_leds(struct fwnode_handle *child, struct lp50xx *priv,
if (num_leds > 1) { if (num_leds > 1) {
if (num_leds > priv->chip_info->max_modules) { if (num_leds > priv->chip_info->max_modules) {
dev_err(&priv->client->dev, "reg property is invalid\n"); dev_err(priv->dev, "reg property is invalid\n");
return -EINVAL; return -EINVAL;
} }
@ -412,13 +412,13 @@ static int lp50xx_probe_leds(struct fwnode_handle *child, struct lp50xx *priv,
ret = fwnode_property_read_u32_array(child, "reg", led_banks, num_leds); ret = fwnode_property_read_u32_array(child, "reg", led_banks, num_leds);
if (ret) { if (ret) {
dev_err(&priv->client->dev, "reg property is missing\n"); dev_err(priv->dev, "reg property is missing\n");
return ret; return ret;
} }
ret = lp50xx_set_banks(priv, led_banks); ret = lp50xx_set_banks(priv, led_banks);
if (ret) { if (ret) {
dev_err(&priv->client->dev, "Cannot setup banked LEDs\n"); dev_err(priv->dev, "Cannot setup banked LEDs\n");
return ret; return ret;
} }
@ -426,12 +426,12 @@ static int lp50xx_probe_leds(struct fwnode_handle *child, struct lp50xx *priv,
} else { } else {
ret = fwnode_property_read_u32(child, "reg", &led_number); ret = fwnode_property_read_u32(child, "reg", &led_number);
if (ret) { if (ret) {
dev_err(&priv->client->dev, "led reg property missing\n"); dev_err(priv->dev, "led reg property missing\n");
return ret; return ret;
} }
if (led_number > priv->chip_info->num_leds) { if (led_number > priv->chip_info->num_leds) {
dev_err(&priv->client->dev, "led-sources property is invalid\n"); dev_err(priv->dev, "led-sources property is invalid\n");
return -EINVAL; return -EINVAL;
} }
@ -467,7 +467,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
led = &priv->leds[i]; led = &priv->leds[i];
ret = fwnode_property_count_u32(child, "reg"); ret = fwnode_property_count_u32(child, "reg");
if (ret < 0) { if (ret < 0) {
dev_err(&priv->client->dev, "reg property is invalid\n"); dev_err(priv->dev, "reg property is invalid\n");
goto child_out; goto child_out;
} }
@ -507,12 +507,11 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
led_cdev = &led->mc_cdev.led_cdev; led_cdev = &led->mc_cdev.led_cdev;
led_cdev->brightness_set_blocking = lp50xx_brightness_set; led_cdev->brightness_set_blocking = lp50xx_brightness_set;
ret = devm_led_classdev_multicolor_register_ext(&priv->client->dev, ret = devm_led_classdev_multicolor_register_ext(priv->dev,
&led->mc_cdev, &led->mc_cdev,
&init_data); &init_data);
if (ret) { if (ret) {
dev_err(&priv->client->dev, "led register err: %d\n", dev_err(priv->dev, "led register err: %d\n", ret);
ret);
goto child_out; goto child_out;
} }
i++; i++;
@ -575,15 +574,14 @@ static int lp50xx_remove(struct i2c_client *client)
ret = lp50xx_enable_disable(led, 0); ret = lp50xx_enable_disable(led, 0);
if (ret) { if (ret) {
dev_err(&led->client->dev, "Failed to disable chip\n"); dev_err(led->dev, "Failed to disable chip\n");
return ret; return ret;
} }
if (led->regulator) { if (led->regulator) {
ret = regulator_disable(led->regulator); ret = regulator_disable(led->regulator);
if (ret) if (ret)
dev_err(&led->client->dev, dev_err(led->dev, "Failed to disable regulator\n");
"Failed to disable regulator\n");
} }
mutex_destroy(&led->lock); mutex_destroy(&led->lock);