| Message ID | 05636b651b9a3b13aa3a3b7d3faa00f2a8de6bca.1684493615.git.mazziesaccount@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1402913c92beb13dc3830c9d986bc4de4b8a9b27 |
| Headers | show |
| Series | fix fwnode_irq_get[_byname()] returnvalue | expand |
On Fri, 19 May 2023 14:01:23 +0300 Matti Vaittinen <mazziesaccount@gmail.com> wrote: > fwnode_irq_get() was changed to not return 0 anymore. > > Drop check for return value 0. > > Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > Revsion history: > v4 => v5: > - drop unnecessary data->irqnr = -1 assignment > > The first patch of the series changes the fwnode_irq_get() so this depends > on the first patch of the series and should not be applied alone. > --- > drivers/iio/proximity/mb1232.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/proximity/mb1232.c b/drivers/iio/proximity/mb1232.c > index e70cac8240af..3ae226297a00 100644 > --- a/drivers/iio/proximity/mb1232.c > +++ b/drivers/iio/proximity/mb1232.c > @@ -76,7 +76,7 @@ static s16 mb1232_read_distance(struct mb1232_data *data) > goto error_unlock; > } > > - if (data->irqnr >= 0) { > + if (data->irqnr > 0) { > /* it cannot take more than 100 ms */ > ret = wait_for_completion_killable_timeout(&data->ranging, > HZ/10); > @@ -212,10 +212,7 @@ static int mb1232_probe(struct i2c_client *client) > init_completion(&data->ranging); > > data->irqnr = fwnode_irq_get(dev_fwnode(&client->dev), 0); > - if (data->irqnr <= 0) { > - /* usage of interrupt is optional */ > - data->irqnr = -1; > - } else { > + if (data->irqnr > 0) { > ret = devm_request_irq(dev, data->irqnr, mb1232_handle_irq, > IRQF_TRIGGER_FALLING, id->name, indio_dev); > if (ret < 0) {
Fri, May 19, 2023 at 02:01:23PM +0300, Matti Vaittinen kirjoitti: > fwnode_irq_get() was changed to not return 0 anymore. > > Drop check for return value 0. > > Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> With or without below being addressed, Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > --- > Revsion history: > v4 => v5: > - drop unnecessary data->irqnr = -1 assignment > > The first patch of the series changes the fwnode_irq_get() so this depends > on the first patch of the series and should not be applied alone. > --- > drivers/iio/proximity/mb1232.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/proximity/mb1232.c b/drivers/iio/proximity/mb1232.c > index e70cac8240af..3ae226297a00 100644 > --- a/drivers/iio/proximity/mb1232.c > +++ b/drivers/iio/proximity/mb1232.c > @@ -76,7 +76,7 @@ static s16 mb1232_read_distance(struct mb1232_data *data) > goto error_unlock; > } > > - if (data->irqnr >= 0) { > + if (data->irqnr > 0) { > /* it cannot take more than 100 ms */ > ret = wait_for_completion_killable_timeout(&data->ranging, > HZ/10); > @@ -212,10 +212,7 @@ static int mb1232_probe(struct i2c_client *client) > init_completion(&data->ranging); > > data->irqnr = fwnode_irq_get(dev_fwnode(&client->dev), 0); > - if (data->irqnr <= 0) { > - /* usage of interrupt is optional */ Maybe this comment can be kept. > - data->irqnr = -1; > - } else { > + if (data->irqnr > 0) { > ret = devm_request_irq(dev, data->irqnr, mb1232_handle_irq, > IRQF_TRIGGER_FALLING, id->name, indio_dev); > if (ret < 0) {
diff --git a/drivers/iio/proximity/mb1232.c b/drivers/iio/proximity/mb1232.c index e70cac8240af..3ae226297a00 100644 --- a/drivers/iio/proximity/mb1232.c +++ b/drivers/iio/proximity/mb1232.c @@ -76,7 +76,7 @@ static s16 mb1232_read_distance(struct mb1232_data *data) goto error_unlock; } - if (data->irqnr >= 0) { + if (data->irqnr > 0) { /* it cannot take more than 100 ms */ ret = wait_for_completion_killable_timeout(&data->ranging, HZ/10); @@ -212,10 +212,7 @@ static int mb1232_probe(struct i2c_client *client) init_completion(&data->ranging); data->irqnr = fwnode_irq_get(dev_fwnode(&client->dev), 0); - if (data->irqnr <= 0) { - /* usage of interrupt is optional */ - data->irqnr = -1; - } else { + if (data->irqnr > 0) { ret = devm_request_irq(dev, data->irqnr, mb1232_handle_irq, IRQF_TRIGGER_FALLING, id->name, indio_dev); if (ret < 0) {
fwnode_irq_get() was changed to not return 0 anymore. Drop check for return value 0. Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> --- Revsion history: v4 => v5: - drop unnecessary data->irqnr = -1 assignment The first patch of the series changes the fwnode_irq_get() so this depends on the first patch of the series and should not be applied alone. --- drivers/iio/proximity/mb1232.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)