openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_tiocmd: make ni_tio_cmd() a proper comedi (*do_cmd) 

Change the parameters to ni_tio_cmd() to make it a proper comedi
(*do_cmd) function.

The wrappers in the ni_660x and ni_mio_common modules are still needed
to request the mite channel and setup the device before actually doing
the command.

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>
This commit is contained in:
H Hartley Sweeten 2013-12-19 16:32:04 -07:00 committed by Greg Kroah-Hartman
parent c3f3b431de
commit 16cc181d63
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,9 +825,8 @@ static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return retval; return retval;
} }
ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL); ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);
retval = ni_tio_cmd(counter, s->async);
return retval; return ni_tio_cmd(dev, s);
} }
static int ni_660x_cancel(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_660x_cancel(struct comedi_device *dev, struct comedi_subdevice *s)

7
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -5007,9 +5007,8 @@ static void GPCT_Reset(struct comedi_device *dev, int chan)
#ifdef PCIDMA #ifdef PCIDMA
static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
int retval;
struct ni_gpct *counter = s->private; struct ni_gpct *counter = s->private;
/* const struct comedi_cmd *cmd = &s->async->cmd; */ int retval;
retval = ni_request_gpct_mite_channel(dev, counter->counter_index, retval = ni_request_gpct_mite_channel(dev, counter->counter_index,
COMEDI_INPUT); COMEDI_INPUT);
@ -5020,8 +5019,8 @@ static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
} }
ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL); ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);
ni_e_series_enable_second_irq(dev, counter->counter_index, 1); ni_e_series_enable_second_irq(dev, counter->counter_index, 1);
retval = ni_tio_cmd(counter, s->async);
return retval; return ni_tio_cmd(dev, s);
} }
#endif #endif

2
drivers/staging/comedi/drivers/ni_tio.h
View File

@ -143,7 +143,7 @@ int ni_tio_insn_config(struct comedi_device *, struct comedi_subdevice *,
struct comedi_insn *, unsigned int *data); struct comedi_insn *, unsigned int *data);
int ni_tio_insn_write(struct comedi_device *, struct comedi_subdevice *, int ni_tio_insn_write(struct comedi_device *, struct comedi_subdevice *,
struct comedi_insn *, unsigned int *data); struct comedi_insn *, unsigned int *data);
int ni_tio_cmd(struct ni_gpct *, struct comedi_async *); int ni_tio_cmd(struct comedi_device *, struct comedi_subdevice *);
int ni_tio_cmdtest(struct comedi_device *, struct comedi_subdevice *, int ni_tio_cmdtest(struct comedi_device *, struct comedi_subdevice *,
struct comedi_cmd *); struct comedi_cmd *);
int ni_tio_cancel(struct ni_gpct *); int ni_tio_cancel(struct ni_gpct *);

4
drivers/staging/comedi/drivers/ni_tiocmd.c
View File

@ -201,8 +201,10 @@ static int ni_tio_cmd_setup(struct ni_gpct *counter, struct comedi_async *async)
return retval; return retval;
} }
int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async) int ni_tio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_gpct *counter = s->private;
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd; struct comedi_cmd *cmd = &async->cmd;
int retval = 0; int retval = 0;
unsigned long flags; unsigned long flags;