leds: max5970: Make use of dev_err_probe()

andy-shev · lag-linaro · commit e7baa5b437a7 · 2023-12-21T14:42:59.000Z
Simplify the error handling in probe function by switching from dev_err() to dev_err_probe(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20231214184050.1272848-4-andriy.shevchenko@linux.intel.com Signed-off-by: Lee Jones <lee@kernel.org>
diff --git a/drivers/leds/leds-max5970.c b/drivers/leds/leds-max5970.c
@@ -62,7 +62,7 @@ static int max5970_led_probe(struct platform_device *pdev)
 			continue;
 
 		if (reg >= MAX5970_NUM_LEDS) {
-			dev_err(dev, "invalid LED (%u >= %d)\n", reg, MAX5970_NUM_LEDS);
+			dev_err_probe(dev, -EINVAL, "invalid LED (%u >= %d)\n", reg, MAX5970_NUM_LEDS);
 			continue;
 		}
 
@@ -86,8 +86,7 @@ static int max5970_led_probe(struct platform_device *pdev)
 		ret = devm_led_classdev_register(dev, &ddata->cdev);
 		if (ret < 0) {
 			fwnode_handle_put(child);
-			dev_err(dev, "Failed to initialize LED %u\n", reg);
-			return ret;
+			return dev_err_probe(dev, ret, "Failed to initialize LED %u\n", reg);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static int max5970_led_probe(struct platform_device *pdev)`
`62`	`62`	`continue;`
`63`	`63`
`64`	`64`	`if (reg >= MAX5970_NUM_LEDS) {`
`65`		`- dev_err(dev, "invalid LED (%u >= %d)\n", reg, MAX5970_NUM_LEDS);`
	`65`	`+ dev_err_probe(dev, -EINVAL, "invalid LED (%u >= %d)\n", reg, MAX5970_NUM_LEDS);`
`66`	`66`	`continue;`
`67`	`67`	`}`
`68`	`68`
`@@ -86,8 +86,7 @@ static int max5970_led_probe(struct platform_device *pdev)`
`86`	`86`	`ret = devm_led_classdev_register(dev, &ddata->cdev);`
`87`	`87`	`if (ret < 0) {`
`88`	`88`	`fwnode_handle_put(child);`
`89`		`- dev_err(dev, "Failed to initialize LED %u\n", reg);`
`90`		`- return ret;`
	`89`	`+ return dev_err_probe(dev, ret, "Failed to initialize LED %u\n", reg);`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`