Commit d546b896 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: comedidev.h: remove 'new_size' param from subdevice (*buf_change)

This parameter is never used by any of the comedi drivers that provide a
(*buf_change) callback. If the 'new_size' is needed in the callback it can
be found from the 's->async->prealloc_bufsz' as done in the ni_pcidio driver.

Remove the unused parameter.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57a4f4cf
...@@ -268,7 +268,7 @@ static int resize_async_buffer(struct comedi_device *dev, ...@@ -268,7 +268,7 @@ static int resize_async_buffer(struct comedi_device *dev,
return retval; return retval;
if (s->buf_change) { if (s->buf_change) {
retval = s->buf_change(dev, s, new_size); retval = s->buf_change(dev, s);
if (retval < 0) if (retval < 0)
return retval; return retval;
} }
......
...@@ -77,8 +77,7 @@ struct comedi_subdevice { ...@@ -77,8 +77,7 @@ struct comedi_subdevice {
int (*cancel)(struct comedi_device *, struct comedi_subdevice *); int (*cancel)(struct comedi_device *, struct comedi_subdevice *);
/* called when the buffer changes */ /* called when the buffer changes */
int (*buf_change)(struct comedi_device *dev, int (*buf_change)(struct comedi_device *, struct comedi_subdevice *);
struct comedi_subdevice *s, unsigned long new_size);
void (*munge)(struct comedi_device *dev, struct comedi_subdevice *s, void (*munge)(struct comedi_device *dev, struct comedi_subdevice *s,
void *data, unsigned int num_bytes, void *data, unsigned int num_bytes,
......
...@@ -320,7 +320,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev, ...@@ -320,7 +320,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
return -ENOMEM; return -ENOMEM;
} }
if (s->buf_change) { if (s->buf_change) {
ret = s->buf_change(dev, s, buf_size); ret = s->buf_change(dev, s);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
......
...@@ -825,8 +825,7 @@ static int ni_660x_input_poll(struct comedi_device *dev, ...@@ -825,8 +825,7 @@ static int ni_660x_input_poll(struct comedi_device *dev,
} }
static int ni_660x_buf_change(struct comedi_device *dev, static int ni_660x_buf_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_660x_private *devpriv = dev->private; struct ni_660x_private *devpriv = dev->private;
struct ni_gpct *counter = s->private; struct ni_gpct *counter = s->private;
......
...@@ -787,7 +787,7 @@ static int ni_pcidio_cancel(struct comedi_device *dev, ...@@ -787,7 +787,7 @@ static int ni_pcidio_cancel(struct comedi_device *dev,
} }
static int ni_pcidio_change(struct comedi_device *dev, static int ni_pcidio_change(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned long new_size) struct comedi_subdevice *s)
{ {
struct nidio96_private *devpriv = dev->private; struct nidio96_private *devpriv = dev->private;
int ret; int ret;
......
...@@ -977,8 +977,7 @@ static const struct ni_board_struct ni_boards[] = { ...@@ -977,8 +977,7 @@ static const struct ni_board_struct ni_boards[] = {
#include "ni_mio_common.c" #include "ni_mio_common.c"
static int pcimio_ai_change(struct comedi_device *dev, static int pcimio_ai_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int ret; int ret;
...@@ -991,8 +990,7 @@ static int pcimio_ai_change(struct comedi_device *dev, ...@@ -991,8 +990,7 @@ static int pcimio_ai_change(struct comedi_device *dev,
} }
static int pcimio_ao_change(struct comedi_device *dev, static int pcimio_ao_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int ret; int ret;
...@@ -1005,8 +1003,7 @@ static int pcimio_ao_change(struct comedi_device *dev, ...@@ -1005,8 +1003,7 @@ static int pcimio_ao_change(struct comedi_device *dev,
} }
static int pcimio_gpct0_change(struct comedi_device *dev, static int pcimio_gpct0_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int ret; int ret;
...@@ -1019,8 +1016,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev, ...@@ -1019,8 +1016,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev,
} }
static int pcimio_gpct1_change(struct comedi_device *dev, static int pcimio_gpct1_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int ret; int ret;
...@@ -1033,8 +1029,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev, ...@@ -1033,8 +1029,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
} }
static int pcimio_dio_change(struct comedi_device *dev, static int pcimio_dio_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s)
unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment