| Message ID | 1491208718-32068-10-git-send-email-peda@axentia.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Apr 03, 2017 at 10:38:38AM +0200, Peter Rosin wrote: > i2c_mux_add_adapter already logs a message on failure. > > Signed-off-by: Peter Rosin <peda@axentia.se> > --- > drivers/media/usb/cx231xx/cx231xx-i2c.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c > index 35e9acfe63d3..dff514e147da 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c > +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c > @@ -576,17 +576,10 @@ int cx231xx_i2c_mux_create(struct cx231xx *dev) > > int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no) > { > - int rc; > - > - rc = i2c_mux_add_adapter(dev->muxc, > - 0, > - mux_no /* chan_id */, > - 0 /* class */); > - if (rc) > - dev_warn(dev->dev, > - "i2c mux %d register FAILED\n", mux_no); > - > - return rc; > + return i2c_mux_add_adapter(dev->muxc, > + 0, > + mux_no /* chan_id */, > + 0 /* class */); Could be argued that the whole function is obsolete now and the c231xx-core can call i2c_mux_add_adapter() directly. But maybe this is a seperate patch. > } > > void cx231xx_i2c_mux_unregister(struct cx231xx *dev) > -- > 2.1.4 >
On 2017-04-03 12:26, Wolfram Sang wrote: > On Mon, Apr 03, 2017 at 10:38:38AM +0200, Peter Rosin wrote: >> i2c_mux_add_adapter already logs a message on failure. >> >> Signed-off-by: Peter Rosin <peda@axentia.se> >> --- >> drivers/media/usb/cx231xx/cx231xx-i2c.c | 15 ++++----------- >> 1 file changed, 4 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c >> index 35e9acfe63d3..dff514e147da 100644 >> --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c >> +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c >> @@ -576,17 +576,10 @@ int cx231xx_i2c_mux_create(struct cx231xx *dev) >> >> int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no) >> { >> - int rc; >> - >> - rc = i2c_mux_add_adapter(dev->muxc, >> - 0, >> - mux_no /* chan_id */, >> - 0 /* class */); >> - if (rc) >> - dev_warn(dev->dev, >> - "i2c mux %d register FAILED\n", mux_no); >> - >> - return rc; >> + return i2c_mux_add_adapter(dev->muxc, >> + 0, >> + mux_no /* chan_id */, >> + 0 /* class */); > > Could be argued that the whole function is obsolete now and the > c231xx-core can call i2c_mux_add_adapter() directly. But maybe this is a > seperate patch. Agreed on all counts. BTW, the ..._unregister function below is equally "obsolete". I'm going to leave the removal of both functions at the discretion of whomever takes care of cx231xx maintenance... Cheers, peda >> } >> >> void cx231xx_i2c_mux_unregister(struct cx231xx *dev) >> -- >> 2.1.4 >>
diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c index 35e9acfe63d3..dff514e147da 100644 --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c @@ -576,17 +576,10 @@ int cx231xx_i2c_mux_create(struct cx231xx *dev) int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no) { - int rc; - - rc = i2c_mux_add_adapter(dev->muxc, - 0, - mux_no /* chan_id */, - 0 /* class */); - if (rc) - dev_warn(dev->dev, - "i2c mux %d register FAILED\n", mux_no); - - return rc; + return i2c_mux_add_adapter(dev->muxc, + 0, + mux_no /* chan_id */, + 0 /* class */); } void cx231xx_i2c_mux_unregister(struct cx231xx *dev)
i2c_mux_add_adapter already logs a message on failure. Signed-off-by: Peter Rosin <peda@axentia.se> --- drivers/media/usb/cx231xx/cx231xx-i2c.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)