Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg

[mirror_ubuntu-jammy-kernel.git] / drivers / iio / common / scmi_sensors / scmi_iio.c

diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
index 872d87ca6256a635c55f30ba71b67e8a22a4c156..63e4cec9de5e28be9ced5376f30c7394fed6b0ce 100644 (file)
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@ -528,20 +528,6 @@ static int scmi_iio_set_sampling_freq_avail(struct iio_dev *iio_dev)
        return 0;
 }
 
-static int scmi_iio_buffers_setup(struct iio_dev *scmi_iiodev)
-{
-       struct iio_buffer *buffer;
-
-       buffer = devm_iio_kfifo_allocate(&scmi_iiodev->dev);
-       if (!buffer)
-               return -ENOMEM;
-
-       iio_device_attach_buffer(scmi_iiodev, buffer);
-       scmi_iiodev->modes |= INDIO_BUFFER_SOFTWARE;
-       scmi_iiodev->setup_ops = &scmi_iio_buffer_ops;
-       return 0;
-}
-
 static struct iio_dev *scmi_alloc_iiodev(struct device *dev,
                                         struct scmi_handle *handle,
                                         const struct scmi_sensor_info *sensor_info)
@@ -644,7 +630,10 @@ static int scmi_iio_dev_probe(struct scmi_device *sdev)
                        return PTR_ERR(scmi_iio_dev);
                }
 
-               err = scmi_iio_buffers_setup(scmi_iio_dev);
+               err = devm_iio_kfifo_buffer_setup(&scmi_iio_dev->dev,
+                                                 scmi_iio_dev,
+                                                 INDIO_BUFFER_SOFTWARE,
+                                                 &scmi_iio_buffer_ops);
                if (err < 0) {
                        dev_err(dev,
                                "IIO buffer setup error at sensor %s: %d\n",