Commit 2c82f5b8 authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Mark Brown

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: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20230406194158.963352-8-cristian.ciocaltea@collabora.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6bb18339
...@@ -568,10 +568,9 @@ static int fan53555_regulator_probe(struct i2c_client *client) ...@@ -568,10 +568,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
if (!pdata) if (!pdata)
pdata = fan53555_parse_dt(&client->dev, np, &di->desc); pdata = fan53555_parse_dt(&client->dev, np, &di->desc);
if (!pdata || !pdata->regulator) { if (!pdata || !pdata->regulator)
dev_err(&client->dev, "Platform data not found!\n"); return dev_err_probe(&client->dev, -ENODEV,
return -ENODEV; "Platform data not found!\n");
}
di->regulator = pdata->regulator; di->regulator = pdata->regulator;
if (client->dev.of_node) { if (client->dev.of_node) {
...@@ -580,10 +579,9 @@ static int fan53555_regulator_probe(struct i2c_client *client) ...@@ -580,10 +579,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
} else { } else {
/* if no ramp constraint set, get the pdata ramp_delay */ /* if no ramp constraint set, get the pdata ramp_delay */
if (!di->regulator->constraints.ramp_delay) { if (!di->regulator->constraints.ramp_delay) {
if (pdata->slew_rate >= ARRAY_SIZE(slew_rates)) { if (pdata->slew_rate >= ARRAY_SIZE(slew_rates))
dev_err(&client->dev, "Invalid slew_rate\n"); return dev_err_probe(&client->dev, -EINVAL,
return -EINVAL; "Invalid slew_rate\n");
}
di->regulator->constraints.ramp_delay di->regulator->constraints.ramp_delay
= slew_rates[pdata->slew_rate]; = slew_rates[pdata->slew_rate];
...@@ -593,34 +591,31 @@ static int fan53555_regulator_probe(struct i2c_client *client) ...@@ -593,34 +591,31 @@ static int fan53555_regulator_probe(struct i2c_client *client)
} }
regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config); regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
if (IS_ERR(regmap)) { if (IS_ERR(regmap))
dev_err(&client->dev, "Failed to allocate regmap!\n"); return dev_err_probe(&client->dev, PTR_ERR(regmap),
return PTR_ERR(regmap); "Failed to allocate regmap!\n");
}
di->dev = &client->dev; di->dev = &client->dev;
i2c_set_clientdata(client, di); i2c_set_clientdata(client, di);
/* Get chip ID */ /* Get chip ID */
ret = regmap_read(regmap, FAN53555_ID1, &val); ret = regmap_read(regmap, FAN53555_ID1, &val);
if (ret < 0) { if (ret < 0)
dev_err(&client->dev, "Failed to get chip ID!\n"); return dev_err_probe(&client->dev, ret, "Failed to get chip ID!\n");
return ret;
}
di->chip_id = val & DIE_ID; di->chip_id = val & DIE_ID;
/* Get chip revision */ /* Get chip revision */
ret = regmap_read(regmap, FAN53555_ID2, &val); ret = regmap_read(regmap, FAN53555_ID2, &val);
if (ret < 0) { if (ret < 0)
dev_err(&client->dev, "Failed to get chip Rev!\n"); return dev_err_probe(&client->dev, ret, "Failed to get chip Rev!\n");
return ret;
}
di->chip_rev = val & DIE_REV; di->chip_rev = val & DIE_REV;
dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n", dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",
di->chip_id, di->chip_rev); di->chip_id, di->chip_rev);
/* Device init */ /* Device init */
ret = fan53555_device_setup(di, pdata); ret = fan53555_device_setup(di, pdata);
if (ret < 0) { if (ret < 0)
dev_err(&client->dev, "Failed to setup device!\n"); return dev_err_probe(&client->dev, ret, "Failed to setup device!\n");
return ret;
}
/* Register regulator */ /* Register regulator */
config.dev = di->dev; config.dev = di->dev;
config.init_data = di->regulator; config.init_data = di->regulator;
...@@ -630,9 +625,9 @@ static int fan53555_regulator_probe(struct i2c_client *client) ...@@ -630,9 +625,9 @@ static int fan53555_regulator_probe(struct i2c_client *client)
ret = fan53555_regulator_register(di, &config); ret = fan53555_regulator_register(di, &config);
if (ret < 0) if (ret < 0)
dev_err(&client->dev, "Failed to register regulator!\n"); dev_err_probe(&client->dev, ret, "Failed to register regulator!\n");
return ret;
return ret;
} }
static const struct i2c_device_id fan53555_id[] = { static const struct i2c_device_id fan53555_id[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment