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

Commit a046c1e8 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman
Browse files

staging:iio:events: Use non-atmoic bitops 



We always hold the waitqueue lock when modifying the flags field. So it is safe
to use the non-atomic bitops here instead of the atomic versions.

The lock has to be held, because we need to clear the busy flag and flush the
event FIFO in one atomic operation when closing the event file descriptor.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e18045ed

drivers/staging/iio/industrialio-event.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int iio_event_chrdev_release(struct inode *inode, struct file *filep) 
	struct iio_event_interface *ev_int = filep->private_data;



	spin_lock(&ev_int->wait.lock);

	clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);

	__clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);

	/*

	 * In order to maintain a clean state for reopening,

	 * clear out any awaiting events. The mask will prevent
@@ -153,7 +153,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) 
		return -ENODEV;



	spin_lock(&ev_int->wait.lock);

	if (test_and_set_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) {

	if (__test_and_set_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) {

		spin_unlock(&ev_int->wait.lock);

		return -EBUSY;

	}
@@ -162,7 +162,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) 
				&iio_event_chrdev_fileops, ev_int, O_RDONLY);

	if (fd < 0) {

		spin_lock(&ev_int->wait.lock);

		clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);

		__clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);

		spin_unlock(&ev_int->wait.lock);

	}

	return fd;