Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9572588c authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron
Browse files

iio: Minor cleanups of industrialio-buffer 



adding one return value check
fix one kerneldoc

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7a1aeba7

drivers/iio/industrialio-buffer.c

+8 −5
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ static int iio_buffer_add_channel_sysfs(struct iio_dev *indio_dev, 
					     0,

					     &indio_dev->dev,

					     &buffer->scan_el_dev_attr_list);

	if (ret)

		goto error_ret;

	attrcount++;

	ret = attrcount;

error_ret:
@@ -412,7 +414,7 @@ ssize_t iio_buffer_show_enable(struct device *dev, 
}

EXPORT_SYMBOL(iio_buffer_show_enable);



/* note NULL used as error indicator as it doesn't make sense. */

/* Note NULL used as error indicator as it doesn't make sense. */

static const unsigned long *iio_scan_mask_match(const unsigned long *av_masks,

					  unsigned int masklength,

					  const unsigned long *mask)
@@ -571,7 +573,7 @@ int iio_update_buffers(struct iio_dev *indio_dev, 
		indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;

	} else if (indio_dev->modes & INDIO_BUFFER_HARDWARE) {

		indio_dev->currentmode = INDIO_BUFFER_HARDWARE;

	} else { /* should never be reached */

	} else { /* Should never be reached */

		ret = -EINVAL;

		goto error_run_postdisable;

	}
@@ -694,6 +696,7 @@ static bool iio_validate_scan_mask(struct iio_dev *indio_dev, 


/**

 * iio_scan_mask_set() - set particular bit in the scan mask

 * @indio_dev: the iio device

 * @buffer: the buffer whose scan mask we are interested in

 * @bit: the bit to be set.

 *
@@ -714,7 +717,7 @@ int iio_scan_mask_set(struct iio_dev *indio_dev, 
	if (trialmask == NULL)

		return -ENOMEM;

	if (!indio_dev->masklength) {

		WARN_ON("trying to set scanmask prior to registering buffer\n");

		WARN_ON("Trying to set scanmask prior to registering buffer\n");

		goto err_invalid_mask;

	}

	bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength);