iio: kfifo: Remove unused argument in iio_kfifo_allocate

indio_dev was unused in function body plus some small style fix - add new
lines after "if(sth) return sth" and before the last return statement.

The argument was removed also in its client.

Signed-off-by: Karol Wrona <k.wrona@samsung.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index d550ac7d23659a30371efbd1761e01f9b6324225..5eea299518a3e857adb8a3263ca73b9ef21a4176 100644 (file)
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -250,7 +250,7 @@ static int tiadc_iio_buffered_hardware_setup(struct iio_dev *indio_dev,
        struct iio_buffer *buffer;
        int ret;
 
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (!buffer)
                return -ENOMEM;
 

diff --git a/drivers/iio/industrialio-triggered-buffer.c b/drivers/iio/industrialio-triggered-buffer.c
index 61a5d0404edf95a975d8bd4e4804c0b0c256e83e..15a5341b5e7b303b80257db09853a2a62560b8d1 100644 (file)
--- a/drivers/iio/industrialio-triggered-buffer.c
+++ b/drivers/iio/industrialio-triggered-buffer.c
@@ -49,7 +49,7 @@ int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
        struct iio_buffer *buffer;
        int ret;
 
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (!buffer) {
                ret = -ENOMEM;
                goto error_ret;

diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index b20a9cfbc8edd8f16470ef38df5092e608c7075f..7f6fad658e8331af048c0ba876b46d04dcdc8921 100644 (file)
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -140,18 +140,20 @@ static const struct iio_buffer_access_funcs kfifo_access_funcs = {
        .release = &iio_kfifo_buffer_release,
 };
 
-struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
+struct iio_buffer *iio_kfifo_allocate(void)
 {
        struct iio_kfifo *kf;
 
-       kf = kzalloc(sizeof *kf, GFP_KERNEL);
+       kf = kzalloc(sizeof(*kf), GFP_KERNEL);
        if (!kf)
                return NULL;
+
        kf->update_needed = true;
        iio_buffer_init(&kf->buffer);
        kf->buffer.access = &kfifo_access_funcs;
        kf->buffer.length = 2;
        mutex_init(&kf->user_lock);
+
        return &kf->buffer;
 }
 EXPORT_SYMBOL(iio_kfifo_allocate);

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 9efc77b0ebdd4d8411f055e177b0f74433d5cefe..1fd90090a633580dbc2dbbd1cd985ffc06d49f8e 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -393,7 +393,7 @@ int lis3l02dq_configure_buffer(struct iio_dev *indio_dev)
        int ret;
        struct iio_buffer *buffer;
 
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (!buffer)
                return -ENOMEM;
 

diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index a2d72c1021197663f4fd009b9b91b2371aa2ca42..360a4c980722267d8dc2dba1f7288fbbd7666376 100644 (file)
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -121,7 +121,7 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev)
        struct iio_buffer *buffer;
 
        /* Allocate a buffer to use - here a kfifo */
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (buffer == NULL) {
                ret = -ENOMEM;
                goto error_ret;

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index c50b1380b9aa3cc7d304d206f7689d7dff167c84..39f60aca08384554759949b56c7208c3b77360bc 100644 (file)
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -626,7 +626,7 @@ static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 {
        struct iio_buffer *buffer;
 
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (!buffer)
                return -ENOMEM;
 

diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 27c3ed6ca468d5f968d6a849587c9e14549d370e..782fd9a3bc0d2c620264404ccac28afad9bc36d9 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -119,7 +119,7 @@ int ade7758_configure_ring(struct iio_dev *indio_dev)
        struct iio_buffer *buffer;
        int ret = 0;
 
-       buffer = iio_kfifo_allocate(indio_dev);
+       buffer = iio_kfifo_allocate();
        if (!buffer) {
                ret = -ENOMEM;
                return ret;

diff --git a/include/linux/iio/kfifo_buf.h b/include/linux/iio/kfifo_buf.h
index 25eeac762e849d4825bdb0dad85d5e8fb9fcbf4d..1a8d57a417387d7bd7843e46ab1ee7f21a63bcf0 100644 (file)
--- a/include/linux/iio/kfifo_buf.h
+++ b/include/linux/iio/kfifo_buf.h
@@ -5,7 +5,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
 
-struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev);
+struct iio_buffer *iio_kfifo_allocate(void);
 void iio_kfifo_free(struct iio_buffer *r);
 
 #endif