From: Ian Abbott <abbotti@mev.co.uk>
To: <driverdev-devel@linuxdriverproject.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Abbott <abbotti@mev.co.uk>,
H Hartley Sweeten <hartleys@visionengravers.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 6/7] staging: comedi: comedi_fops: send SIGIO according to command direction
Date: Fri, 27 Mar 2015 15:13:05 +0000 [thread overview]
Message-ID: <1427469186-11222-7-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1427469186-11222-1-git-send-email-abbotti@mev.co.uk>
`comedi_event()` is called from low-level drivers to handle comedi
asynchronous command event flags. Some events cause waiting tasks to be
woken up, and a `SIGIO` signal to be sent via `kill_fasync()`. The
signal code is `POLL_OUT` if the subdevice supports commands in the
"write" direction, or `POLL_IN` for the "read" direction. If the
subdevice supports commands in either direction, it sends two `SIGIO`
signals, one with each code. Change that latter case to only send one
`SIGIO` signal, using the direction of the current command to determine
the signal code. If the `CMDF_WRITE` flag is set in the current
command, it's in the "write" direction, otherwise it's in the "read"
direction.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/comedi_fops.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 68ced20..7ae605f 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2674,11 +2674,11 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
}
if (async->cb_mask & events) {
+ int si_code;
+
wake_up_interruptible(&async->wait_head);
- if (s->subdev_flags & SDF_CMD_READ)
- kill_fasync(&dev->async_queue, SIGIO, POLL_IN);
- if (s->subdev_flags & SDF_CMD_WRITE)
- kill_fasync(&dev->async_queue, SIGIO, POLL_OUT);
+ si_code = async->cmd.flags & CMDF_WRITE ? POLL_OUT : POLL_IN;
+ kill_fasync(&dev->async_queue, SIGIO, si_code);
}
}
EXPORT_SYMBOL_GPL(comedi_event);
--
2.1.4
next prev parent reply other threads:[~2015-03-27 15:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 15:12 [PATCH 0/7] staging: comedi: comedi_fops: some runflag and event handling changes Ian Abbott
2015-03-27 15:13 ` [PATCH 1/7] staging: comedi: comedi_fops: rename comedi_set_subdevice_runflags() Ian Abbott
2015-03-27 15:13 ` [PATCH 2/7] staging: comedi: comedi_fops: eliminate a use of subdevice spin-lock Ian Abbott
2015-03-27 15:13 ` [PATCH 3/7] staging: comedi: comedi_fops: simplify comedi_is_subdevice_idle() Ian Abbott
2015-03-27 15:13 ` [PATCH 4/7] staging: comedi: comedi_fops: remove unnecessary s->async use Ian Abbott
2015-03-27 15:13 ` [PATCH 5/7] staging: comedi: comedi_fops: always clear events Ian Abbott
2015-03-27 15:13 ` Ian Abbott [this message]
2015-03-27 15:13 ` [PATCH 7/7] staging: comedi: comedi_fops: extend spin-lock scope in comedi_event() Ian Abbott
2015-03-30 16:47 ` Hartley Sweeten
2015-03-31 9:42 ` Ian Abbott
2015-03-31 16:13 ` Hartley Sweeten
2015-04-01 9:10 ` Ian Abbott
2015-03-30 17:13 ` [PATCH 0/7] staging: comedi: comedi_fops: some runflag and event handling changes Hartley Sweeten
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=1427469186-11222-7-git-send-email-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hartleys@visionengravers.com \
--cc=linux-kernel@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).