redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
H Hartley Sweeten 2014-07-21 11:48:32 -07:00 committed by Greg Kroah-Hartman
parent 57a4f4cf40
commit d546b8966e
6 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,7 @@ static int resize_async_buffer(struct comedi_device *dev,
return retval;
if (s->buf_change) {
retval = s->buf_change(dev, s, new_size);
retval = s->buf_change(dev, s);
if (retval < 0)
return retval;
}

3
drivers/staging/comedi/comedidev.h
View File

@ -77,8 +77,7 @@ struct comedi_subdevice {
int (*cancel)(struct comedi_device *, struct comedi_subdevice *);
/* called when the buffer changes */
int (*buf_change)(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned long new_size);
int (*buf_change)(struct comedi_device *, struct comedi_subdevice *);
void (*munge)(struct comedi_device *dev, struct comedi_subdevice *s,
void *data, unsigned int num_bytes,

2
drivers/staging/comedi/drivers.c
View File

@ -320,7 +320,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
return -ENOMEM;
}
if (s->buf_change) {
ret = s->buf_change(dev, s, buf_size);
ret = s->buf_change(dev, s);
if (ret < 0)
return ret;
}

3
drivers/staging/comedi/drivers/ni_660x.c
View File

@ -825,8 +825,7 @@ static int ni_660x_input_poll(struct comedi_device *dev,
}
static int ni_660x_buf_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_660x_private *devpriv = dev->private;
struct ni_gpct *counter = s->private;

2
drivers/staging/comedi/drivers/ni_pcidio.c
View File

@ -787,7 +787,7 @@ static int ni_pcidio_cancel(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;
int ret;

15
drivers/staging/comedi/drivers/ni_pcimio.c
View File

@ -977,8 +977,7 @@ static const struct ni_board_struct ni_boards[] = {
#include "ni_mio_common.c"
static int pcimio_ai_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_private *devpriv = dev->private;
int ret;
@ -991,8 +990,7 @@ static int pcimio_ai_change(struct comedi_device *dev,
}
static int pcimio_ao_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_private *devpriv = dev->private;
int ret;
@ -1005,8 +1003,7 @@ static int pcimio_ao_change(struct comedi_device *dev,
}
static int pcimio_gpct0_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_private *devpriv = dev->private;
int ret;
@ -1019,8 +1016,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev,
}
static int pcimio_gpct1_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_private *devpriv = dev->private;
int ret;
@ -1033,8 +1029,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
}
static int pcimio_dio_change(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned long new_size)
struct comedi_subdevice *s)
{
struct ni_private *devpriv = dev->private;
int ret;