]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: adc: ad7768-1: Move buffer allocation to a separate function
authorSergiu Cuciurean <sergiu.cuciurean@analog.com>
Fri, 11 Apr 2025 15:57:23 +0000 (12:57 -0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 22 Apr 2025 18:10:04 +0000 (19:10 +0100)
This change moves the buffer allocation and related trigger allocation
in a separate function, making space for adding another type of iio
buffer if needed.

Reviewed-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Signed-off-by: Jonathan Santos <Jonathan.Santos@analog.com>
Link: https://patch.msgid.link/11c1777b406875ce1a7216dc4b094ff99af8da7f.1744325346.git.Jonathan.Santos@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7768-1.c

index 34712d3756e2283d3e539fadf1d8dc193f474708..66087fabe1816cc9383c8c725f0f0dc9f9e73de4 100644 (file)
@@ -619,6 +619,31 @@ static int ad7768_set_channel_label(struct iio_dev *indio_dev,
        return 0;
 }
 
+static int ad7768_triggered_buffer_alloc(struct iio_dev *indio_dev)
+{
+       struct ad7768_state *st = iio_priv(indio_dev);
+       int ret;
+
+       st->trig = devm_iio_trigger_alloc(indio_dev->dev.parent, "%s-dev%d",
+                                         indio_dev->name,
+                                         iio_device_id(indio_dev));
+       if (!st->trig)
+               return -ENOMEM;
+
+       st->trig->ops = &ad7768_trigger_ops;
+       iio_trigger_set_drvdata(st->trig, indio_dev);
+       ret = devm_iio_trigger_register(indio_dev->dev.parent, st->trig);
+       if (ret)
+               return ret;
+
+       indio_dev->trig = iio_trigger_get(st->trig);
+
+       return devm_iio_triggered_buffer_setup(indio_dev->dev.parent, indio_dev,
+                                              &iio_pollfunc_store_time,
+                                              &ad7768_trigger_handler,
+                                              &ad7768_buffer_ops);
+}
+
 static int ad7768_probe(struct spi_device *spi)
 {
        struct ad7768_state *st;
@@ -689,20 +714,6 @@ static int ad7768_probe(struct spi_device *spi)
                return ret;
        }
 
-       st->trig = devm_iio_trigger_alloc(&spi->dev, "%s-dev%d",
-                                         indio_dev->name,
-                                         iio_device_id(indio_dev));
-       if (!st->trig)
-               return -ENOMEM;
-
-       st->trig->ops = &ad7768_trigger_ops;
-       iio_trigger_set_drvdata(st->trig, indio_dev);
-       ret = devm_iio_trigger_register(&spi->dev, st->trig);
-       if (ret)
-               return ret;
-
-       indio_dev->trig = iio_trigger_get(st->trig);
-
        init_completion(&st->completion);
 
        ret = ad7768_set_channel_label(indio_dev, ARRAY_SIZE(ad7768_channels));
@@ -716,10 +727,7 @@ static int ad7768_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
-                                             &iio_pollfunc_store_time,
-                                             &ad7768_trigger_handler,
-                                             &ad7768_buffer_ops);
+       ret = ad7768_triggered_buffer_alloc(indio_dev);
        if (ret)
                return ret;