All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: mux: only print failure message on error
@ 2017-05-14 16:41 ` Peter Rosin
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Rosin @ 2017-05-14 16:41 UTC (permalink / raw)
  To: linux-kernel; +Cc: Peter Rosin, Wolfram Sang, linux-i2c

As is, a failure message is printed unconditionally, which is confusing.
And noisy.

Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/i2c/i2c-mux.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 26f7237558ba..ccf2ce1836c8 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
 	if (force_nr) {
 		priv->adap.nr = force_nr;
 		ret = i2c_add_numbered_adapter(&priv->adap);
-		dev_err(&parent->dev,
-			"failed to add mux-adapter %u as bus %u (error=%d)\n",
-			chan_id, force_nr, ret);
+		if (ret < 0) {
+			dev_err(&parent->dev,
+				"failed to add mux-adapter %u as bus %u (error=%d)\n",
+				chan_id, force_nr, ret);
+			kfree(priv);
+			return ret;
+		}
 	} else {
 		ret = i2c_add_adapter(&priv->adap);
-		dev_err(&parent->dev,
-			"failed to add mux-adapter %u (error=%d)\n",
-			chan_id, ret);
-	}
-	if (ret < 0) {
-		kfree(priv);
-		return ret;
+		if (ret < 0) {
+			dev_err(&parent->dev,
+				"failed to add mux-adapter %u (error=%d)\n",
+				chan_id, ret);
+			kfree(priv);
+			return ret;
+		}
 	}
 
 	WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] i2c: mux: only print failure message on error
@ 2017-05-14 16:41 ` Peter Rosin
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Rosin @ 2017-05-14 16:41 UTC (permalink / raw)
  To: linux-kernel; +Cc: Peter Rosin, Wolfram Sang, linux-i2c

As is, a failure message is printed unconditionally, which is confusing.
And noisy.

Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/i2c/i2c-mux.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 26f7237558ba..ccf2ce1836c8 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
 	if (force_nr) {
 		priv->adap.nr = force_nr;
 		ret = i2c_add_numbered_adapter(&priv->adap);
-		dev_err(&parent->dev,
-			"failed to add mux-adapter %u as bus %u (error=%d)\n",
-			chan_id, force_nr, ret);
+		if (ret < 0) {
+			dev_err(&parent->dev,
+				"failed to add mux-adapter %u as bus %u (error=%d)\n",
+				chan_id, force_nr, ret);
+			kfree(priv);
+			return ret;
+		}
 	} else {
 		ret = i2c_add_adapter(&priv->adap);
-		dev_err(&parent->dev,
-			"failed to add mux-adapter %u (error=%d)\n",
-			chan_id, ret);
-	}
-	if (ret < 0) {
-		kfree(priv);
-		return ret;
+		if (ret < 0) {
+			dev_err(&parent->dev,
+				"failed to add mux-adapter %u (error=%d)\n",
+				chan_id, ret);
+			kfree(priv);
+			return ret;
+		}
 	}
 
 	WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] i2c: mux: only print failure message on error
  2017-05-14 16:41 ` Peter Rosin
  (?)
@ 2017-05-15  4:53 ` Leon Romanovsky
  2017-05-15  6:59     ` Peter Rosin
  -1 siblings, 1 reply; 5+ messages in thread
From: Leon Romanovsky @ 2017-05-15  4:53 UTC (permalink / raw)
  To: Peter Rosin; +Cc: linux-kernel, Wolfram Sang, linux-i2c

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

On Sun, May 14, 2017 at 06:41:13PM +0200, Peter Rosin wrote:
> As is, a failure message is printed unconditionally, which is confusing.
> And noisy.
>
> Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
> Signed-off-by: Peter Rosin <peda@axentia.se>
> ---
>  drivers/i2c/i2c-mux.c | 24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
> index 26f7237558ba..ccf2ce1836c8 100644
> --- a/drivers/i2c/i2c-mux.c
> +++ b/drivers/i2c/i2c-mux.c
> @@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
>  	if (force_nr) {
>  		priv->adap.nr = force_nr;
>  		ret = i2c_add_numbered_adapter(&priv->adap);
> -		dev_err(&parent->dev,
> -			"failed to add mux-adapter %u as bus %u (error=%d)\n",
> -			chan_id, force_nr, ret);
> +		if (ret < 0) {
> +			dev_err(&parent->dev,
> +				"failed to add mux-adapter %u as bus %u (error=%d)\n",
> +				chan_id, force_nr, ret);
> +			kfree(priv);
> +			return ret;
> +		}
>  	} else {
>  		ret = i2c_add_adapter(&priv->adap);
> -		dev_err(&parent->dev,
> -			"failed to add mux-adapter %u (error=%d)\n",
> -			chan_id, ret);
> -	}
> -	if (ret < 0) {
> -		kfree(priv);
> -		return ret;
> +		if (ret < 0) {
> +			dev_err(&parent->dev,
> +				"failed to add mux-adapter %u (error=%d)\n",
> +				chan_id, ret);
> +			kfree(priv);
> +			return ret;

It is better to add goto label, this will give one place for kfree->return code.

Thanks

> +		}
>  	}
>
>  	WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj,
> --
> 2.1.4
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] i2c: mux: only print failure message on error
  2017-05-15  4:53 ` Leon Romanovsky
@ 2017-05-15  6:59     ` Peter Rosin
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Rosin @ 2017-05-15  6:59 UTC (permalink / raw)
  To: Leon Romanovsky; +Cc: linux-kernel, Wolfram Sang, linux-i2c

On 2017-05-15 06:53, Leon Romanovsky wrote:
> On Sun, May 14, 2017 at 06:41:13PM +0200, Peter Rosin wrote:
>> As is, a failure message is printed unconditionally, which is confusing.
>> And noisy.
>>
>> Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
>> Signed-off-by: Peter Rosin <peda@axentia.se>
>> ---
>>  drivers/i2c/i2c-mux.c | 24 ++++++++++++++----------
>>  1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
>> index 26f7237558ba..ccf2ce1836c8 100644
>> --- a/drivers/i2c/i2c-mux.c
>> +++ b/drivers/i2c/i2c-mux.c
>> @@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
>>  	if (force_nr) {
>>  		priv->adap.nr = force_nr;
>>  		ret = i2c_add_numbered_adapter(&priv->adap);
>> -		dev_err(&parent->dev,
>> -			"failed to add mux-adapter %u as bus %u (error=%d)\n",
>> -			chan_id, force_nr, ret);
>> +		if (ret < 0) {
>> +			dev_err(&parent->dev,
>> +				"failed to add mux-adapter %u as bus %u (error=%d)\n",
>> +				chan_id, force_nr, ret);
>> +			kfree(priv);
>> +			return ret;
>> +		}
>>  	} else {
>>  		ret = i2c_add_adapter(&priv->adap);
>> -		dev_err(&parent->dev,
>> -			"failed to add mux-adapter %u (error=%d)\n",
>> -			chan_id, ret);
>> -	}
>> -	if (ret < 0) {
>> -		kfree(priv);
>> -		return ret;
>> +		if (ret < 0) {
>> +			dev_err(&parent->dev,
>> +				"failed to add mux-adapter %u (error=%d)\n",
>> +				chan_id, ret);
>> +			kfree(priv);
>> +			return ret;
> 
> It is better to add goto label, this will give one place for kfree->return code.

I guess that can be argued, but it's going to end up being more lines. Whatever,
I'll just repaint the shed. v2 coming up.

Cheers,
peda

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] i2c: mux: only print failure message on error
@ 2017-05-15  6:59     ` Peter Rosin
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Rosin @ 2017-05-15  6:59 UTC (permalink / raw)
  To: Leon Romanovsky; +Cc: linux-kernel, Wolfram Sang, linux-i2c

On 2017-05-15 06:53, Leon Romanovsky wrote:
> On Sun, May 14, 2017 at 06:41:13PM +0200, Peter Rosin wrote:
>> As is, a failure message is printed unconditionally, which is confusing.
>> And noisy.
>>
>> Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
>> Signed-off-by: Peter Rosin <peda@axentia.se>
>> ---
>>  drivers/i2c/i2c-mux.c | 24 ++++++++++++++----------
>>  1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
>> index 26f7237558ba..ccf2ce1836c8 100644
>> --- a/drivers/i2c/i2c-mux.c
>> +++ b/drivers/i2c/i2c-mux.c
>> @@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
>>  	if (force_nr) {
>>  		priv->adap.nr = force_nr;
>>  		ret = i2c_add_numbered_adapter(&priv->adap);
>> -		dev_err(&parent->dev,
>> -			"failed to add mux-adapter %u as bus %u (error=%d)\n",
>> -			chan_id, force_nr, ret);
>> +		if (ret < 0) {
>> +			dev_err(&parent->dev,
>> +				"failed to add mux-adapter %u as bus %u (error=%d)\n",
>> +				chan_id, force_nr, ret);
>> +			kfree(priv);
>> +			return ret;
>> +		}
>>  	} else {
>>  		ret = i2c_add_adapter(&priv->adap);
>> -		dev_err(&parent->dev,
>> -			"failed to add mux-adapter %u (error=%d)\n",
>> -			chan_id, ret);
>> -	}
>> -	if (ret < 0) {
>> -		kfree(priv);
>> -		return ret;
>> +		if (ret < 0) {
>> +			dev_err(&parent->dev,
>> +				"failed to add mux-adapter %u (error=%d)\n",
>> +				chan_id, ret);
>> +			kfree(priv);
>> +			return ret;
> 
> It is better to add goto label, this will give one place for kfree->return code.

I guess that can be argued, but it's going to end up being more lines. Whatever,
I'll just repaint the shed. v2 coming up.

Cheers,
peda

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-15  6:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-14 16:41 [PATCH] i2c: mux: only print failure message on error Peter Rosin
2017-05-14 16:41 ` Peter Rosin
2017-05-15  4:53 ` Leon Romanovsky
2017-05-15  6:59   ` Peter Rosin
2017-05-15  6:59     ` Peter Rosin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.