diff options
| author | Greg Kroah-Hartman | 2009-04-28 00:15:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-06-19 20:00:33 +0200 |
| commit | fcea115462c690ba09f9df7471d60dda0d86a4ea (patch) | |
| tree | 833d5be24796ac9692b66140a7da77b062e7e18a /drivers/staging/comedi/comedi_fops.c | |
| parent | Staging: comedi: remove RT code (diff) | |
| download | kernel-qcow2-linux-fcea115462c690ba09f9df7471d60dda0d86a4ea.tar.gz kernel-qcow2-linux-fcea115462c690ba09f9df7471d60dda0d86a4ea.tar.xz kernel-qcow2-linux-fcea115462c690ba09f9df7471d60dda0d86a4ea.zip | |
Staging: comedi: remove some RT code that lingered
This removes some pieces of RT code that was part of the main code
paths.
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 61b586477c10..9d7c99394ec6 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1998,27 +1998,18 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) if (async->cb_mask & s->async->events) { if (comedi_get_subdevice_runflags(s) & SRF_USER) { - if (dev->rt) { - printk("BUG: comedi_event() code unreachable\n"); - } else { - 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); - } + 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); } } else { if (async->cb_func) async->cb_func(s->async->events, async->cb_arg); - /* XXX bug here. If subdevice A is rt, and - * subdevice B tries to callback to a normal - * linux kernel function, it will be at the - * wrong priority. Since this isn't very - * common, I'm not going to worry about it. */ } } s->async->events = 0; |