staging: comedi: remove async parameter from resize_async_buffer()
authorIan Abbott <abbotti@mev.co.uk>
Fri, 2 May 2014 12:50:14 +0000 (13:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 May 2014 00:12:17 +0000 (20:12 -0400)
The `struct comedi_async *async` parameter of `resize_async_buffer()` is
redundant as its value can be easily derived from the `struct
comedi_subdevice *s` parameter as `s->async`.  Remove the parameter.

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>
drivers/staging/comedi/comedi_fops.c

index ecd27a6fc7f9692b9b8a0fe1f669ff6b36e0ae00..0affd1f96660945efcac2dd9994919373af87206 100644 (file)
@@ -238,9 +238,9 @@ comedi_write_subdevice(const struct comedi_device *dev, unsigned int minor)
 }
 
 static int resize_async_buffer(struct comedi_device *dev,
-                              struct comedi_subdevice *s,
-                              struct comedi_async *async, unsigned new_size)
+                              struct comedi_subdevice *s, unsigned new_size)
 {
+       struct comedi_async *async = s->async;
        int retval;
 
        if (new_size > async->max_bufsize)
@@ -380,7 +380,7 @@ static ssize_t read_buffer_kb_store(struct device *csdev,
        mutex_lock(&dev->mutex);
        s = comedi_read_subdevice(dev, minor);
        if (s && (s->subdev_flags & SDF_CMD_READ) && s->async)
-               err = resize_async_buffer(dev, s, s->async, size);
+               err = resize_async_buffer(dev, s, size);
        else
                err = -EINVAL;
        mutex_unlock(&dev->mutex);
@@ -493,7 +493,7 @@ static ssize_t write_buffer_kb_store(struct device *csdev,
        mutex_lock(&dev->mutex);
        s = comedi_write_subdevice(dev, minor);
        if (s && (s->subdev_flags & SDF_CMD_WRITE) && s->async)
-               err = resize_async_buffer(dev, s, s->async, size);
+               err = resize_async_buffer(dev, s, size);
        else
                err = -EINVAL;
        mutex_unlock(&dev->mutex);
@@ -741,7 +741,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev,
        }
 
        if (bc.size) {
-               retval = resize_async_buffer(dev, s, async, bc.size);
+               retval = resize_async_buffer(dev, s, bc.size);
                if (retval < 0)
                        return retval;
        }