From 258c1dd76bf1223a0f67ff8d799b5eb383a3a632 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 27 Mar 2015 15:13:03 +0000 Subject: [PATCH] staging: comedi: comedi_fops: remove unnecessary s->async use 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_fops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 9e49c8ac0cba..999e7d010c83 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -687,7 +687,7 @@ static void do_become_nonbusy(struct comedi_device *dev, kfree(async->cmd.chanlist); async->cmd.chanlist = NULL; s->busy = NULL; - wake_up_interruptible_all(&s->async->wait_head); + wake_up_interruptible_all(&async->wait_head); } else { dev_err(dev->class_dev, "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)) return; - if (s->async->events & COMEDI_CB_CANCEL_MASK) + if (async->events & COMEDI_CB_CANCEL_MASK) runflags_mask |= COMEDI_SRF_RUNNING; /* * Remember if an error event has occurred, so an error * 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 |= 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); } - if (async->cb_mask & s->async->events) { + if (async->cb_mask & async->events) { 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); } - s->async->events = 0; + async->events = 0; } EXPORT_SYMBOL_GPL(comedi_event); -- 2.30.2