iio: hi8435: Drop hi8435_remove() by using devres for remaining elements

Convert the remainder of hi8435_probe() to use devres and get rid of
hi8435_remove().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-iio@vger.kernel.org
Cc: Chris Healy <cphealy@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index c15f0e154e4d1b5e3ced5d571d13c4309b861e41..8da45bf36d36054b4234f2358b0f91d7591176ee 100644 (file)
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -456,6 +456,11 @@ static irqreturn_t hi8435_trigger_handler(int irq, void *private)
        return IRQ_HANDLED;
 }
 
+static void hi8435_triggered_event_cleanup(void *data)
+{
+       iio_triggered_event_cleanup(data);
+}
+
 static int hi8435_probe(struct spi_device *spi)
 {
        struct iio_dev *idev;
@@ -513,27 +518,13 @@ static int hi8435_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ret = iio_device_register(idev);
-       if (ret < 0) {
-               dev_err(&spi->dev, "unable to register device\n");
-               goto unregister_triggered_event;
-       }
-
-       return 0;
-
-unregister_triggered_event:
-       iio_triggered_event_cleanup(idev);
-       return ret;
-}
-
-static int hi8435_remove(struct spi_device *spi)
-{
-       struct iio_dev *idev = spi_get_drvdata(spi);
-
-       iio_device_unregister(idev);
-       iio_triggered_event_cleanup(idev);
+       ret = devm_add_action_or_reset(&spi->dev,
+                                      hi8435_triggered_event_cleanup,
+                                      idev);
+       if (ret)
+               return ret;
 
-       return 0;
+       return devm_iio_device_register(&spi->dev, idev);
 }
 
 static const struct of_device_id hi8435_dt_ids[] = {
@@ -554,7 +545,6 @@ static struct spi_driver hi8435_driver = {
                .of_match_table = of_match_ptr(hi8435_dt_ids),
        },
        .probe          = hi8435_probe,
-       .remove         = hi8435_remove,
        .id_table       = hi8435_id,
 };
 module_spi_driver(hi8435_driver);