| Message ID | 1443793229-22363-8-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
On 10/02/2015 03:40 PM, Javier Martinez Canillas wrote: > The invoked function already returns zero on success or a negative > errno code so there is no need to open code the logic in the caller. > > This also fixes the following make coccicheck warning: > > drivers/input/keyboard/cap11xx.c:475:1-6: WARNING: end returns can be simplified > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Acked-by: Daniel Mack <daniel@zonque.org> > --- > > drivers/input/keyboard/cap11xx.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c > index 378db10001df..7240316ddfe3 100644 > --- a/drivers/input/keyboard/cap11xx.c > +++ b/drivers/input/keyboard/cap11xx.c > @@ -472,12 +472,8 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, > return -ENXIO; > } > > - error = devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, > - IRQF_ONESHOT, dev_name(dev), priv); > - if (error) > - return error; > - > - return 0; > + return devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, > + IRQF_ONESHOT, dev_name(dev), priv); > } > > static const struct of_device_id cap11xx_dt_ids[] = { > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 02, 2015 at 03:40:18PM +0200, Javier Martinez Canillas wrote: > The invoked function already returns zero on success or a negative > errno code so there is no need to open code the logic in the caller. > > This also fixes the following make coccicheck warning: > > drivers/input/keyboard/cap11xx.c:475:1-6: WARNING: end returns can be simplified > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > drivers/input/keyboard/cap11xx.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c > index 378db10001df..7240316ddfe3 100644 > --- a/drivers/input/keyboard/cap11xx.c > +++ b/drivers/input/keyboard/cap11xx.c > @@ -472,12 +472,8 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, > return -ENXIO; > } > > - error = devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, > - IRQF_ONESHOT, dev_name(dev), priv); > - if (error) > - return error; > - > - return 0; > + return devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, > + IRQF_ONESHOT, dev_name(dev), priv); > } For cases where we have multiple of potentially failing actions: error = action1(); if (error) return error; error = action2(); if (error) return error; error = action3(); if (error) return error; return 0; I prefer not to compress the last action check to "return action3()". Thanks.
Hello Dmitry, On 10/02/2015 08:09 PM, Dmitry Torokhov wrote: [snip] >> >> - error = devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, >> - IRQF_ONESHOT, dev_name(dev), priv); >> - if (error) >> - return error; >> - >> - return 0; >> + return devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, >> + IRQF_ONESHOT, dev_name(dev), priv); >> } > > For cases where we have multiple of potentially failing actions: > > error = action1(); > if (error) > return error; > > error = action2(); > if (error) > return error; > > error = action3(); > if (error) > return error; > > return 0; > > I prefer not to compress the last action check to "return action3()". > Fair enough, I don't mind if you drop those patches then. Thanks a lot for your feedback. > Thanks. > Best regards,
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 378db10001df..7240316ddfe3 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -472,12 +472,8 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, return -ENXIO; } - error = devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, - IRQF_ONESHOT, dev_name(dev), priv); - if (error) - return error; - - return 0; + return devm_request_threaded_irq(dev, irq, NULL, cap11xx_thread_func, + IRQF_ONESHOT, dev_name(dev), priv); } static const struct of_device_id cap11xx_dt_ids[] = {
The invoked function already returns zero on success or a negative errno code so there is no need to open code the logic in the caller. This also fixes the following make coccicheck warning: drivers/input/keyboard/cap11xx.c:475:1-6: WARNING: end returns can be simplified Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- drivers/input/keyboard/cap11xx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)