Commit 26e46ef7 authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron
Browse files

iio: buffer: fix coding style warnings 



Just cosmetics. No functional change intended...

Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20230216101452.591805-4-nuno.sa@analog.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 9a960841

drivers/iio/industrialio-buffer.c

+49 −49
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static ssize_t iio_buffer_write(struct file *filp, const char __user *buf, 
	written = 0;

	add_wait_queue(&rb->pollq, &wait);

	do {

		if (indio_dev->info == NULL)

		if (!indio_dev->info)

			return -ENODEV;



		if (!iio_buffer_space_available(rb)) {
@@ -242,7 +242,7 @@ static __poll_t iio_buffer_poll(struct file *filp, 
	struct iio_buffer *rb = ib->buffer;

	struct iio_dev *indio_dev = ib->indio_dev;



	if (!indio_dev->info || rb == NULL)

	if (!indio_dev->info || !rb)

		return 0;



	poll_wait(filp, &rb->pollq, wait);
@@ -539,7 +539,6 @@ static ssize_t iio_scan_el_store(struct device *dev, 
	mutex_unlock(&iio_dev_opaque->mlock);



	return ret < 0 ? ret : len;



}



static ssize_t iio_scan_el_ts_show(struct device *dev,
@@ -823,7 +822,8 @@ struct iio_device_config { 
};



static int iio_verify_update(struct iio_dev *indio_dev,

	struct iio_buffer *insert_buffer, struct iio_buffer *remove_buffer,

			     struct iio_buffer *insert_buffer,

			     struct iio_buffer *remove_buffer,

			     struct iio_device_config *config)

{

	struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev);
@@ -890,7 +890,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, 


	/* What scan mask do we actually have? */

	compound_mask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL);

	if (compound_mask == NULL)

	if (!compound_mask)

		return -ENOMEM;



	scan_timestamp = false;
@@ -915,7 +915,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, 
						compound_mask,

						strict_scanmask);

		bitmap_free(compound_mask);

		if (scan_mask == NULL)

		if (!scan_mask)

			return -EINVAL;

	} else {

		scan_mask = compound_mask;
@@ -954,16 +954,16 @@ static void iio_buffer_demux_free(struct iio_buffer *buffer) 
}



static int iio_buffer_add_demux(struct iio_buffer *buffer,

	struct iio_demux_table **p, unsigned int in_loc, unsigned int out_loc,

				struct iio_demux_table **p, unsigned int in_loc,

				unsigned int out_loc,

				unsigned int length)

{



	if (*p && (*p)->from + (*p)->length == in_loc &&

	    (*p)->to + (*p)->length == out_loc) {

		(*p)->length += length;

	} else {

		*p = kmalloc(sizeof(**p), GFP_KERNEL);

		if (*p == NULL)

		if (!(*p))

			return -ENOMEM;

		(*p)->from = in_loc;

		(*p)->to = out_loc;
@@ -1027,7 +1027,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, 
		out_loc += length;

	}

	buffer->demux_bounce = kzalloc(out_loc, GFP_KERNEL);

	if (buffer->demux_bounce == NULL) {

	if (!buffer->demux_bounce) {

		ret = -ENOMEM;

		goto error_clear_mux_table;

	}
@@ -1258,7 +1258,7 @@ int iio_update_buffers(struct iio_dev *indio_dev, 
		return 0;



	if (insert_buffer &&

	    (insert_buffer->direction == IIO_BUFFER_DIRECTION_OUT))

	    insert_buffer->direction == IIO_BUFFER_DIRECTION_OUT)

		return -EINVAL;



	mutex_lock(&iio_dev_opaque->info_exist_lock);
@@ -1275,7 +1275,7 @@ int iio_update_buffers(struct iio_dev *indio_dev, 
		goto out_unlock;

	}



	if (indio_dev->info == NULL) {

	if (!indio_dev->info) {

		ret = -ENODEV;

		goto out_unlock;

	}
@@ -1615,7 +1615,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer, 


	buffer_attrcount = 0;

	if (buffer->attrs) {

		while (buffer->attrs[buffer_attrcount] != NULL)

		while (buffer->attrs[buffer_attrcount])

			buffer_attrcount++;

	}

	buffer_attrcount += ARRAY_SIZE(iio_buffer_attrs);
@@ -1651,10 +1651,10 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer, 
				iio_dev_opaque->scan_index_timestamp =

					channels[i].scan_index;

		}

		if (indio_dev->masklength && buffer->scan_mask == NULL) {

		if (indio_dev->masklength && !buffer->scan_mask) {

			buffer->scan_mask = bitmap_zalloc(indio_dev->masklength,

							  GFP_KERNEL);

			if (buffer->scan_mask == NULL) {

			if (!buffer->scan_mask) {

				ret = -ENOMEM;

				goto error_cleanup_dynamic;

			}
@@ -1771,7 +1771,7 @@ int iio_buffers_alloc_sysfs_and_mask(struct iio_dev *indio_dev) 
			goto error_unwind_sysfs_and_mask;

	}



	sz = sizeof(*(iio_dev_opaque->buffer_ioctl_handler));

	sz = sizeof(*iio_dev_opaque->buffer_ioctl_handler);

	iio_dev_opaque->buffer_ioctl_handler = kzalloc(sz, GFP_KERNEL);

	if (!iio_dev_opaque->buffer_ioctl_handler) {

		ret = -ENOMEM;