fwnode_irq_get() was changed to not return 0 anymore.
Drop check for return value 0.
Signed-off-by: Matti Vaittinen <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
---
Revsion history:
v5 =>:
- No changes
v4 => v5:
- drop unnecessary data->irqnr = -1 assignment
The patch changing the fwnode_irq_get() got merged during 5.4:
https://lore.kernel.org/all/[email protected]/
This is a clean-up as agreed.
---
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 fb1073c8d9f7..614e65cb9d42 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) {
--
2.40.1
--
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND
~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =]
On Tue, 1 Aug 2023 15:02:10 +0300
Matti Vaittinen <[email protected]> wrote:
> fwnode_irq_get() was changed to not return 0 anymore.
>
> Drop check for return value 0.
>
> Signed-off-by: Matti Vaittinen <[email protected]>
> Acked-by: Jonathan Cameron <[email protected]>
> Reviewed-by: Andy Shevchenko <[email protected]>
>
Applied fiddling above so I don't ack and sign off on it because
that confuses me :)
Applied to the togreg branch and pushed out as testing for all the
normal reasons.
Thanks,
Jonathan
> ---
> Revsion history:
> v5 =>:
> - No changes
> v4 => v5:
> - drop unnecessary data->irqnr = -1 assignment
>
> The patch changing the fwnode_irq_get() got merged during 5.4:
> https://lore.kernel.org/all/[email protected]/
> This is a clean-up as agreed.
> ---
> 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 fb1073c8d9f7..614e65cb9d42 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) {