From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Lars-Peter Clausen To: Jonathan Cameron CC: Michael Hennerich , , , , Lars-Peter Clausen Subject: [PATCH v2 6/6] staging:iio:events: Use non-atmoic bitops Date: Mon, 19 Dec 2011 11:29:40 +0100 Message-ID: <1324290580-17511-6-git-send-email-lars@metafoo.de> In-Reply-To: <1324290580-17511-1-git-send-email-lars@metafoo.de> References: <1324290580-17511-1-git-send-email-lars@metafoo.de> MIME-Version: 1.0 Content-Type: text/plain List-ID: 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: Lars-Peter Clausen --- drivers/staging/iio/industrialio-event.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/industrialio-event.c b/drivers/staging/iio/industrialio-event.c index 58243d9..5e461e1 100644 --- a/drivers/staging/iio/industrialio-event.c +++ b/drivers/staging/iio/industrialio-event.c @@ -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; -- 1.7.7.3