aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorKarol Wrona <k.wrona@samsung.com>2014-12-19 12:39:24 -0500
committerJonathan Cameron <jic23@kernel.org>2014-12-26 06:20:38 -0500
commit7ab374a053a43050117eb452306b6cd9dcb58cfd (patch)
tree1605369c59a8e0d07a788f17c93ae02cbcd46e2c /drivers/iio
parent614e8842ddf5502f0e781f91695bfbc1e1e1d9b6 (diff)
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>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/ti_am335x_adc.c2
-rw-r--r--drivers/iio/industrialio-triggered-buffer.c2
-rw-r--r--drivers/iio/kfifo_buf.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index d550ac7d2365..5eea299518a3 100644
--- 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,
250 struct iio_buffer *buffer; 250 struct iio_buffer *buffer;
251 int ret; 251 int ret;
252 252
253 buffer = iio_kfifo_allocate(indio_dev); 253 buffer = iio_kfifo_allocate();
254 if (!buffer) 254 if (!buffer)
255 return -ENOMEM; 255 return -ENOMEM;
256 256
diff --git a/drivers/iio/industrialio-triggered-buffer.c b/drivers/iio/industrialio-triggered-buffer.c
index 61a5d0404edf..15a5341b5e7b 100644
--- 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,
49 struct iio_buffer *buffer; 49 struct iio_buffer *buffer;
50 int ret; 50 int ret;
51 51
52 buffer = iio_kfifo_allocate(indio_dev); 52 buffer = iio_kfifo_allocate();
53 if (!buffer) { 53 if (!buffer) {
54 ret = -ENOMEM; 54 ret = -ENOMEM;
55 goto error_ret; 55 goto error_ret;
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index b20a9cfbc8ed..7f6fad658e83 100644
--- 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 = {
140 .release = &iio_kfifo_buffer_release, 140 .release = &iio_kfifo_buffer_release,
141}; 141};
142 142
143struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) 143struct iio_buffer *iio_kfifo_allocate(void)
144{ 144{
145 struct iio_kfifo *kf; 145 struct iio_kfifo *kf;
146 146
147 kf = kzalloc(sizeof *kf, GFP_KERNEL); 147 kf = kzalloc(sizeof(*kf), GFP_KERNEL);
148 if (!kf) 148 if (!kf)
149 return NULL; 149 return NULL;
150
150 kf->update_needed = true; 151 kf->update_needed = true;
151 iio_buffer_init(&kf->buffer); 152 iio_buffer_init(&kf->buffer);
152 kf->buffer.access = &kfifo_access_funcs; 153 kf->buffer.access = &kfifo_access_funcs;
153 kf->buffer.length = 2; 154 kf->buffer.length = 2;
154 mutex_init(&kf->user_lock); 155 mutex_init(&kf->user_lock);
156
155 return &kf->buffer; 157 return &kf->buffer;
156} 158}
157EXPORT_SYMBOL(iio_kfifo_allocate); 159EXPORT_SYMBOL(iio_kfifo_allocate);