iio: sca3000: switch IRQ handling to devm helpers

Convert the threaded IRQ registration to devm_request_threaded_irq() so
that the probe and remove paths can drop manual freeing of irqs.

No functionality change.

Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index 9b1b4c512199b8634db5b2b20365967c931681ab..274e8f3fb763ff4ac0edd9e65156799ca531b34e 100644 (file)
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -1461,34 +1461,27 @@ static int sca3000_probe(struct spi_device *spi)
                return ret;
 
        if (spi->irq) {
-               ret = request_threaded_irq(spi->irq,
-                                          NULL,
-                                          &sca3000_event_handler,
-                                          IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                          "sca3000",
-                                          indio_dev);
+               ret = devm_request_threaded_irq(dev, spi->irq, NULL,
+                                               &sca3000_event_handler,
+                                               IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                               "sca3000",
+                                               indio_dev);
                if (ret)
                        return ret;
        }
        ret = sca3000_clean_setup(st);
        if (ret)
-               goto error_free_irq;
+               return ret;
 
        ret = sca3000_print_rev(indio_dev);
        if (ret)
-               goto error_free_irq;
+               return ret;
 
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto error_free_irq;
+               return ret;
 
        return 0;
-
-error_free_irq:
-       if (spi->irq)
-               free_irq(spi->irq, indio_dev);
-
-       return ret;
 }
 
 static int sca3000_stop_all_interrupts(struct sca3000_state *st)
@@ -1518,8 +1511,6 @@ static void sca3000_remove(struct spi_device *spi)
 
        /* Must ensure no interrupts can be generated after this! */
        sca3000_stop_all_interrupts(st);
-       if (spi->irq)
-               free_irq(spi->irq, indio_dev);
 }
 
 static const struct spi_device_id sca3000_id[] = {