linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe()
@ 2020-08-26 16:15 Krzysztof Kozlowski
  2020-08-26 16:15 ` [PATCH 2/2] iio: magnetometer: iio-mux: " Krzysztof Kozlowski
  2020-08-29 15:21 ` [PATCH 1/2] iio: magnetometer: mag3110: " Jonathan Cameron
  0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:15 UTC (permalink / raw)
  To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, Peter Rosin, Alexandru Ardelean,
	Krzysztof Kozlowski, linux-iio, linux-kernel

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

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 drivers/iio/magnetometer/mag3110.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
index 4d305a21c379..838b13c8bb3d 100644
--- a/drivers/iio/magnetometer/mag3110.c
+++ b/drivers/iio/magnetometer/mag3110.c
@@ -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) {
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] iio: magnetometer: iio-mux: Simplify with dev_err_probe()
  2020-08-26 16:15 [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe() Krzysztof Kozlowski
@ 2020-08-26 16:15 ` Krzysztof Kozlowski
  2020-08-29 15:21 ` [PATCH 1/2] iio: magnetometer: mag3110: " Jonathan Cameron
  1 sibling, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-26 16:15 UTC (permalink / raw)
  To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, Peter Rosin, Alexandru Ardelean,
	Krzysztof Kozlowski, linux-iio, linux-kernel

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

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 drivers/iio/multiplexer/iio-mux.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c
index 6910218fdb00..d219d4a86657 100644
--- a/drivers/iio/multiplexer/iio-mux.c
+++ b/drivers/iio/multiplexer/iio-mux.c
@@ -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) {
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe()
  2020-08-26 16:15 [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe() Krzysztof Kozlowski
  2020-08-26 16:15 ` [PATCH 2/2] iio: magnetometer: iio-mux: " Krzysztof Kozlowski
@ 2020-08-29 15:21 ` Jonathan Cameron
  2020-08-29 15:57   ` Krzysztof Kozlowski
  1 sibling, 1 reply; 4+ messages in thread
From: Jonathan Cameron @ 2020-08-29 15:21 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
	Peter Rosin, Alexandru Ardelean, linux-iio, linux-kernel

On Wed, 26 Aug 2020 18:15:38 +0200
Krzysztof Kozlowski <krzk@kernel.org> wrote:

> Common pattern of handling deferred probe can be simplified with
> dev_err_probe().  Less code and also it prints the error value.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
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

> ---
>  drivers/iio/magnetometer/mag3110.c | 20 ++++++--------------
>  1 file changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
> index 4d305a21c379..838b13c8bb3d 100644
> --- a/drivers/iio/magnetometer/mag3110.c
> +++ b/drivers/iio/magnetometer/mag3110.c
> @@ -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) {


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe()
  2020-08-29 15:21 ` [PATCH 1/2] iio: magnetometer: mag3110: " Jonathan Cameron
@ 2020-08-29 15:57   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-29 15:57 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
	Peter Rosin, Alexandru Ardelean, linux-iio, linux-kernel

On Sat, 29 Aug 2020 at 17:21, Jonathan Cameron <jic23@kernel.org> wrote:
>
> On Wed, 26 Aug 2020 18:15:38 +0200
> Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> > Common pattern of handling deferred probe can be simplified with
> > dev_err_probe().  Less code and also it prints the error value.
> >
> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-08-29 15:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-26 16:15 [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe() Krzysztof Kozlowski
2020-08-26 16:15 ` [PATCH 2/2] iio: magnetometer: iio-mux: " Krzysztof Kozlowski
2020-08-29 15:21 ` [PATCH 1/2] iio: magnetometer: mag3110: " Jonathan Cameron
2020-08-29 15:57   ` Krzysztof Kozlowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).