4d5fe0a362
Move kernel config and patches to kernel 6.6. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
107 lines
3.5 KiB
Diff
107 lines
3.5 KiB
Diff
From 2c82f5b8ae6d0b5bbac1526021d9c3120d183555 Mon Sep 17 00:00:00 2001
|
|
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
|
Date: Thu, 6 Apr 2023 22:41:57 +0300
|
|
Subject: [PATCH] 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 <cristian.ciocaltea@collabora.com>
|
|
Link: https://lore.kernel.org/r/20230406194158.963352-8-cristian.ciocaltea@collabora.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/regulator/fan53555.c | 47 ++++++++++++++++--------------------
|
|
1 file changed, 21 insertions(+), 26 deletions(-)
|
|
|
|
--- a/drivers/regulator/fan53555.c
|
|
+++ b/drivers/regulator/fan53555.c
|
|
@@ -568,10 +568,9 @@ static int fan53555_regulator_probe(stru
|
|
if (!pdata)
|
|
pdata = fan53555_parse_dt(&client->dev, np, &di->desc);
|
|
|
|
- if (!pdata || !pdata->regulator) {
|
|
- dev_err(&client->dev, "Platform data not found!\n");
|
|
- return -ENODEV;
|
|
- }
|
|
+ if (!pdata || !pdata->regulator)
|
|
+ return dev_err_probe(&client->dev, -ENODEV,
|
|
+ "Platform data not found!\n");
|
|
|
|
di->regulator = pdata->regulator;
|
|
if (client->dev.of_node) {
|
|
@@ -580,10 +579,9 @@ static int fan53555_regulator_probe(stru
|
|
} else {
|
|
/* if no ramp constraint set, get the pdata ramp_delay */
|
|
if (!di->regulator->constraints.ramp_delay) {
|
|
- if (pdata->slew_rate >= ARRAY_SIZE(slew_rates)) {
|
|
- dev_err(&client->dev, "Invalid slew_rate\n");
|
|
- return -EINVAL;
|
|
- }
|
|
+ if (pdata->slew_rate >= ARRAY_SIZE(slew_rates))
|
|
+ return dev_err_probe(&client->dev, -EINVAL,
|
|
+ "Invalid slew_rate\n");
|
|
|
|
di->regulator->constraints.ramp_delay
|
|
= slew_rates[pdata->slew_rate];
|
|
@@ -593,34 +591,31 @@ static int fan53555_regulator_probe(stru
|
|
}
|
|
|
|
regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
|
|
- if (IS_ERR(regmap)) {
|
|
- dev_err(&client->dev, "Failed to allocate regmap!\n");
|
|
- return PTR_ERR(regmap);
|
|
- }
|
|
+ if (IS_ERR(regmap))
|
|
+ return dev_err_probe(&client->dev, PTR_ERR(regmap),
|
|
+ "Failed to allocate regmap!\n");
|
|
+
|
|
di->dev = &client->dev;
|
|
i2c_set_clientdata(client, di);
|
|
/* Get chip ID */
|
|
ret = regmap_read(regmap, FAN53555_ID1, &val);
|
|
- if (ret < 0) {
|
|
- dev_err(&client->dev, "Failed to get chip ID!\n");
|
|
- return ret;
|
|
- }
|
|
+ if (ret < 0)
|
|
+ return dev_err_probe(&client->dev, ret, "Failed to get chip ID!\n");
|
|
+
|
|
di->chip_id = val & DIE_ID;
|
|
/* Get chip revision */
|
|
ret = regmap_read(regmap, FAN53555_ID2, &val);
|
|
- if (ret < 0) {
|
|
- dev_err(&client->dev, "Failed to get chip Rev!\n");
|
|
- return ret;
|
|
- }
|
|
+ if (ret < 0)
|
|
+ return dev_err_probe(&client->dev, ret, "Failed to get chip Rev!\n");
|
|
+
|
|
di->chip_rev = val & DIE_REV;
|
|
dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",
|
|
di->chip_id, di->chip_rev);
|
|
/* Device init */
|
|
ret = fan53555_device_setup(di, pdata);
|
|
- if (ret < 0) {
|
|
- dev_err(&client->dev, "Failed to setup device!\n");
|
|
- return ret;
|
|
- }
|
|
+ if (ret < 0)
|
|
+ return dev_err_probe(&client->dev, ret, "Failed to setup device!\n");
|
|
+
|
|
/* Register regulator */
|
|
config.dev = di->dev;
|
|
config.init_data = di->regulator;
|
|
@@ -630,9 +625,9 @@ static int fan53555_regulator_probe(stru
|
|
|
|
ret = fan53555_regulator_register(di, &config);
|
|
if (ret < 0)
|
|
- dev_err(&client->dev, "Failed to register regulator!\n");
|
|
- return ret;
|
|
+ dev_err_probe(&client->dev, ret, "Failed to register regulator!\n");
|
|
|
|
+ return ret;
|
|
}
|
|
|
|
static const struct i2c_device_id fan53555_id[] = {
|