openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: mux: only print failure message on error 

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

Fixes: 8d4d159f25 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter")
Signed-off-by: Peter Rosin <peda@axentia.se>
This commit is contained in:
Peter Rosin 2017-05-15 09:03:50 +02:00
parent a36d4637e4
commit 9fce894d03
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/i2c/i2c-mux.c
View File

@ -395,18 +395,20 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
if (force_nr) { if (force_nr) {
priv->adap.nr = force_nr; priv->adap.nr = force_nr;
ret = i2c_add_numbered_adapter(&priv->adap); ret = i2c_add_numbered_adapter(&priv->adap);
dev_err(&parent->dev, if (ret < 0) {
"failed to add mux-adapter %u as bus %u (error=%d)\n", dev_err(&parent->dev,
chan_id, force_nr, ret); "failed to add mux-adapter %u as bus %u (error=%d)\n",
chan_id, force_nr, ret);
goto err_free_priv;
}
} else { } else {
ret = i2c_add_adapter(&priv->adap); ret = i2c_add_adapter(&priv->adap);
dev_err(&parent->dev, if (ret < 0) {
"failed to add mux-adapter %u (error=%d)\n", dev_err(&parent->dev,
chan_id, ret); "failed to add mux-adapter %u (error=%d)\n",
} chan_id, ret);
if (ret < 0) { goto err_free_priv;
kfree(priv); }
return ret;
} }
WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj, 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; muxc->adapter[muxc->num_adapters++] = &priv->adap;
return 0; return 0;
err_free_priv:
kfree(priv);
return ret;
} }
EXPORT_SYMBOL_GPL(i2c_mux_add_adapter); EXPORT_SYMBOL_GPL(i2c_mux_add_adapter);