iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: comedi_fops: remove unnecessary s->async use

Browse Source 
In places where the `s->async` value has been stored in a local
variable, use the variable instead of repeating `s->async`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2015-03-27 15:13:03 +00:00 committed by Greg Kroah-Hartman
parent 38ee1fd309
commit 258c1dd76b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/comedi_fops.c
View File

@ -687,7 +687,7 @@ static void do_become_nonbusy(struct comedi_device *dev,
kfree(async->cmd.chanlist); kfree(async->cmd.chanlist);
async->cmd.chanlist = NULL; async->cmd.chanlist = NULL;
s->busy = NULL; s->busy = NULL;
wake_up_interruptible_all(&s->async->wait_head); wake_up_interruptible_all(&async->wait_head);
} else { } else {
dev_err(dev->class_dev, dev_err(dev->class_dev,
"BUG: (?) do_become_nonbusy called with async=NULL\n"); "BUG: (?) do_become_nonbusy called with async=NULL\n");
@ -2652,14 +2652,14 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
if (!comedi_is_subdevice_running(s)) if (!comedi_is_subdevice_running(s))
return; return;
if (s->async->events & COMEDI_CB_CANCEL_MASK) if (async->events & COMEDI_CB_CANCEL_MASK)
runflags_mask |= COMEDI_SRF_RUNNING; runflags_mask |= COMEDI_SRF_RUNNING;
/* /*
* Remember if an error event has occurred, so an error * Remember if an error event has occurred, so an error
* can be returned the next time the user does a read(). * can be returned the next time the user does a read().
*/ */
if (s->async->events & COMEDI_CB_ERROR_MASK) { if (async->events & COMEDI_CB_ERROR_MASK) {
runflags_mask |= COMEDI_SRF_ERROR; runflags_mask |= COMEDI_SRF_ERROR;
runflags |= COMEDI_SRF_ERROR; runflags |= COMEDI_SRF_ERROR;
} }
@ -2671,14 +2671,14 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
comedi_update_subdevice_runflags(s, runflags_mask, runflags); comedi_update_subdevice_runflags(s, runflags_mask, runflags);
} }
if (async->cb_mask & s->async->events) { if (async->cb_mask & async->events) {
wake_up_interruptible(&async->wait_head); wake_up_interruptible(&async->wait_head);
if (s->subdev_flags & SDF_CMD_READ) if (s->subdev_flags & SDF_CMD_READ)
kill_fasync(&dev->async_queue, SIGIO, POLL_IN); kill_fasync(&dev->async_queue, SIGIO, POLL_IN);
if (s->subdev_flags & SDF_CMD_WRITE) if (s->subdev_flags & SDF_CMD_WRITE)
kill_fasync(&dev->async_queue, SIGIO, POLL_OUT); kill_fasync(&dev->async_queue, SIGIO, POLL_OUT);
} }
s->async->events = 0; async->events = 0;
} }
EXPORT_SYMBOL_GPL(comedi_event); EXPORT_SYMBOL_GPL(comedi_event);