* [PATCH v2] i2c: mux: only print failure message on error
@ 2017-05-15 7:40 ` Peter Rosin
0 siblings, 0 replies; 3+ messages in thread
From: Peter Rosin @ 2017-05-15 7:40 UTC (permalink / raw)
To: Wolfram Sang, linux-kernel; +Cc: Peter Rosin, Leon Romanovsky, 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 | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
Wolfram, you can take this one directly if you wish. You can also
take [1] (and optionally [2]) directly if you wish. Or just holler
and I'll send you a pull request with [1] and this patch for-current.
[1] i2c: mux: reg: put away the parent i2c adapter on probe failure
https://patchwork.ozlabs.org/patch/759487/
[2] i2c: mux: reg: rename label to indicate what it does
https://patchwork.ozlabs.org/patch/759486/
Changes since v1:
- Use goto instead of having two kfree, as pointed out by Leon Romanovsky.
Cheers,
peda
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 26f7237558ba..9669ca4937b8 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -395,18 +395,20 @@ 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);
+ goto err_free_priv;
+ }
} 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);
+ goto err_free_priv;
+ }
}
WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj,
@@ -422,6 +424,10 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
muxc->adapter[muxc->num_adapters++] = &priv->adap;
return 0;
+
+err_free_priv:
+ kfree(priv);
+ return ret;
}
EXPORT_SYMBOL_GPL(i2c_mux_add_adapter);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] i2c: mux: only print failure message on error
@ 2017-05-15 7:40 ` Peter Rosin
0 siblings, 0 replies; 3+ messages in thread
From: Peter Rosin @ 2017-05-15 7:40 UTC (permalink / raw)
To: Wolfram Sang, linux-kernel; +Cc: Peter Rosin, Leon Romanovsky, 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 | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
Wolfram, you can take this one directly if you wish. You can also
take [1] (and optionally [2]) directly if you wish. Or just holler
and I'll send you a pull request with [1] and this patch for-current.
[1] i2c: mux: reg: put away the parent i2c adapter on probe failure
https://patchwork.ozlabs.org/patch/759487/
[2] i2c: mux: reg: rename label to indicate what it does
https://patchwork.ozlabs.org/patch/759486/
Changes since v1:
- Use goto instead of having two kfree, as pointed out by Leon Romanovsky.
Cheers,
peda
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 26f7237558ba..9669ca4937b8 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -395,18 +395,20 @@ 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);
+ goto err_free_priv;
+ }
} 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);
+ goto err_free_priv;
+ }
}
WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj,
@@ -422,6 +424,10 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
muxc->adapter[muxc->num_adapters++] = &priv->adap;
return 0;
+
+err_free_priv:
+ kfree(priv);
+ return ret;
}
EXPORT_SYMBOL_GPL(i2c_mux_add_adapter);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] i2c: mux: only print failure message on error
2017-05-15 7:40 ` Peter Rosin
(?)
@ 2017-05-15 9:31 ` Wolfram Sang
-1 siblings, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2017-05-15 9:31 UTC (permalink / raw)
To: Peter Rosin; +Cc: linux-kernel, Leon Romanovsky, linux-i2c
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
> Wolfram, you can take this one directly if you wish. You can also
> take [1] (and optionally [2]) directly if you wish. Or just holler
> and I'll send you a pull request with [1] and this patch for-current.
Frankly, I'd prefer a pull-request. Less chances that I mix up things
for patches which I don't really follow because I entrust them to you :)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-15 9:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-15 7:40 [PATCH v2] i2c: mux: only print failure message on error Peter Rosin
2017-05-15 7:40 ` Peter Rosin
2017-05-15 9:31 ` Wolfram Sang
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.