From: Lars-Peter Clausen <lars@metafoo.de>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Jonathan Cameron <jic23@kernel.org>, <devel@driverdev.osuosl.org>,
<linux-iio@vger.kernel.org>, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 6/6] staging:iio:events: Use non-atmoic bitops
Date: Tue, 3 Jan 2012 14:59:42 +0100 [thread overview]
Message-ID: <1325599182-5376-6-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1325599182-5376-1-git-send-email-lars@metafoo.de>
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 <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
---
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 800f67d..66d320b 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
prev parent reply other threads:[~2012-01-03 13:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-03 13:59 [PATCH 1/6] staging:iio: Update iio_event_interface documentation Lars-Peter Clausen
2012-01-03 13:59 ` [PATCH 2/6] staging:iio: Factor out event handling into its own file Lars-Peter Clausen
2012-01-03 13:59 ` [PATCH 3/6] staging:iio:events: Use kfifo for event queue Lars-Peter Clausen
2012-01-03 13:59 ` [PATCH 4/6] staging:iio:events: Use waitqueue lock to protect " Lars-Peter Clausen
2012-01-03 13:59 ` [PATCH 5/6] staging:iio:events: Add poll support Lars-Peter Clausen
2012-01-03 13:59 ` Lars-Peter Clausen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1325599182-5376-6-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).