Skip to contentSkip to conversation

iio: magnetometer: mag3110: Simplify with dev_err_probe()

PATCH In review Krzysztof Kozlowski 2 participants 4 messages Aug 26, 2020 – Aug 29, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iio: magnetometer: mag3110: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.

---
 drivers/iio/magnetometer/mag3110.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/iio/magnetometer/mag3110.c +6 -14
index 4d305a21c379..838b13c8bb3d 100644
@@ -476,22 +476,14 @@ static int mag3110_probe(struct i2c_client *client,
 	data = iio_priv(indio_dev);
 
 	data->vdd_reg = devm_regulator_get(&client->dev, "vdd");
-	if (IS_ERR(data->vdd_reg)) {
-		if (PTR_ERR(data->vdd_reg) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(&client->dev, "failed to get VDD regulator!\n");
-		return PTR_ERR(data->vdd_reg);
-	}
+	if (IS_ERR(data->vdd_reg))
+		return dev_err_probe(&client->dev, PTR_ERR(data->vdd_reg),
+				     "failed to get VDD regulator!\n");
 
 	data->vddio_reg = devm_regulator_get(&client->dev, "vddio");
-	if (IS_ERR(data->vddio_reg)) {
-		if (PTR_ERR(data->vddio_reg) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(&client->dev, "failed to get VDDIO regulator!\n");
-		return PTR_ERR(data->vddio_reg);
-	}
+	if (IS_ERR(data->vddio_reg))
+		return dev_err_probe(&client->dev, PTR_ERR(data->vddio_reg),
+				     "failed to get VDDIO regulator!\n");
 
 	ret = regulator_enable(data->vdd_reg);
 	if (ret) {
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 iio: magnetometer: iio-mux: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.

---
 drivers/iio/multiplexer/iio-mux.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/iio/multiplexer/iio-mux.c +2 -5
index 6910218fdb00..d219d4a86657 100644
@@ -354,11 +354,8 @@ static int mux_probe(struct platform_device *pdev)
 		return -ENODEV;
 
 	parent = devm_iio_channel_get(dev, "parent");
-	if (IS_ERR(parent)) {
-		if (PTR_ERR(parent) != -EPROBE_DEFER)
-			dev_err(dev, "failed to get parent channel\n");
-		return PTR_ERR(parent);
-	}
+	if (IS_ERR(parent))
+		return dev_err_probe(dev, PTR_ERR(parent), "failed to get parent channel\n");
 
 	sizeof_ext_info = iio_get_channel_ext_info_count(parent);
 	if (sizeof_ext_info) {
Signature · 1 line
2.17.1
maintainer
#2 lore raw
In reply to Krzysztof Kozlowski
Quoted 4 lines · On Wed, 26 Aug 2020 18:15:38 +0200 Krzysztof Kozlowski <[email protected]> wrote:

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.

I'm a lazy person, so if you have a series like this where you decide to post a new version without anyone having commented on it, please send a quick reply to say you have done that. Avoids me applying wrong versions of things!

Thanks,

Jonathan

Quoted 37 lines
---
 drivers/iio/magnetometer/mag3110.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/iio/magnetometer/mag3110.c +6 -14
index 4d305a21c379..838b13c8bb3d 100644
@@ -476,22 +476,14 @@ static int mag3110_probe(struct i2c_client *client,
 	data = iio_priv(indio_dev);
 
 	data->vdd_reg = devm_regulator_get(&client->dev, "vdd");
-	if (IS_ERR(data->vdd_reg)) {
-		if (PTR_ERR(data->vdd_reg) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(&client->dev, "failed to get VDD regulator!\n");
-		return PTR_ERR(data->vdd_reg);
-	}
+	if (IS_ERR(data->vdd_reg))
+		return dev_err_probe(&client->dev, PTR_ERR(data->vdd_reg),
+				     "failed to get VDD regulator!\n");
 
 	data->vddio_reg = devm_regulator_get(&client->dev, "vddio");
-	if (IS_ERR(data->vddio_reg)) {
-		if (PTR_ERR(data->vddio_reg) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-
-		dev_err(&client->dev, "failed to get VDDIO regulator!\n");
-		return PTR_ERR(data->vddio_reg);
-	}
+	if (IS_ERR(data->vddio_reg))
+		return dev_err_probe(&client->dev, PTR_ERR(data->vddio_reg),
+				     "failed to get VDDIO regulator!\n");
 
 	ret = regulator_enable(data->vdd_reg);
 	if (ret) {
#3 lore raw
Quoted 4 lines · Jonathan Cameron

On Wed, 26 Aug 2020 18:15:38 +0200
Krzysztof Kozlowski <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines

Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value.

I'm a lazy person, so if you have a series like this where you decide to post a new version without anyone having commented on it, please send a quick reply to say you have done that. Avoids me applying wrong versions of things!

It was the part of v3 (18 patches) which you just applied so these two you can skip.

Sorry for not mentioning it.

Best regards,
Krzysztof