Skip to content

Commit 2c82f5b

Browse files
cristiccbroonie
authored andcommitted
regulator: fan53555: Use dev_err_probe
Use dev_err_probe() instead of dev_err() in the probe function, which ensures the error code is always printed and, additionally, simplifies the code a bit. Signed-off-by: Cristian Ciocaltea <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6bb1833 commit 2c82f5b

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

drivers/regulator/fan53555.c

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
568568
if (!pdata)
569569
pdata = fan53555_parse_dt(&client->dev, np, &di->desc);
570570

571-
if (!pdata || !pdata->regulator) {
572-
dev_err(&client->dev, "Platform data not found!\n");
573-
return -ENODEV;
574-
}
571+
if (!pdata || !pdata->regulator)
572+
return dev_err_probe(&client->dev, -ENODEV,
573+
"Platform data not found!\n");
575574

576575
di->regulator = pdata->regulator;
577576
if (client->dev.of_node) {
@@ -580,10 +579,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
580579
} else {
581580
/* if no ramp constraint set, get the pdata ramp_delay */
582581
if (!di->regulator->constraints.ramp_delay) {
583-
if (pdata->slew_rate >= ARRAY_SIZE(slew_rates)) {
584-
dev_err(&client->dev, "Invalid slew_rate\n");
585-
return -EINVAL;
586-
}
582+
if (pdata->slew_rate >= ARRAY_SIZE(slew_rates))
583+
return dev_err_probe(&client->dev, -EINVAL,
584+
"Invalid slew_rate\n");
587585

588586
di->regulator->constraints.ramp_delay
589587
= slew_rates[pdata->slew_rate];
@@ -593,34 +591,31 @@ static int fan53555_regulator_probe(struct i2c_client *client)
593591
}
594592

595593
regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
596-
if (IS_ERR(regmap)) {
597-
dev_err(&client->dev, "Failed to allocate regmap!\n");
598-
return PTR_ERR(regmap);
599-
}
594+
if (IS_ERR(regmap))
595+
return dev_err_probe(&client->dev, PTR_ERR(regmap),
596+
"Failed to allocate regmap!\n");
597+
600598
di->dev = &client->dev;
601599
i2c_set_clientdata(client, di);
602600
/* Get chip ID */
603601
ret = regmap_read(regmap, FAN53555_ID1, &val);
604-
if (ret < 0) {
605-
dev_err(&client->dev, "Failed to get chip ID!\n");
606-
return ret;
607-
}
602+
if (ret < 0)
603+
return dev_err_probe(&client->dev, ret, "Failed to get chip ID!\n");
604+
608605
di->chip_id = val & DIE_ID;
609606
/* Get chip revision */
610607
ret = regmap_read(regmap, FAN53555_ID2, &val);
611-
if (ret < 0) {
612-
dev_err(&client->dev, "Failed to get chip Rev!\n");
613-
return ret;
614-
}
608+
if (ret < 0)
609+
return dev_err_probe(&client->dev, ret, "Failed to get chip Rev!\n");
610+
615611
di->chip_rev = val & DIE_REV;
616612
dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",
617613
di->chip_id, di->chip_rev);
618614
/* Device init */
619615
ret = fan53555_device_setup(di, pdata);
620-
if (ret < 0) {
621-
dev_err(&client->dev, "Failed to setup device!\n");
622-
return ret;
623-
}
616+
if (ret < 0)
617+
return dev_err_probe(&client->dev, ret, "Failed to setup device!\n");
618+
624619
/* Register regulator */
625620
config.dev = di->dev;
626621
config.init_data = di->regulator;
@@ -630,9 +625,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
630625

631626
ret = fan53555_regulator_register(di, &config);
632627
if (ret < 0)
633-
dev_err(&client->dev, "Failed to register regulator!\n");
634-
return ret;
628+
dev_err_probe(&client->dev, ret, "Failed to register regulator!\n");
635629

630+
return ret;
636631
}
637632

638633
static const struct i2c_device_id fan53555_id[] = {

0 commit comments

Comments
 (0)