Use `struct comedi_kcmd` instead of `struct comedi_cmd`.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
drivers/staging/comedi/drivers/ni_660x.c | 4 ++--
drivers/staging/comedi/drivers/ni_mio_common.c | 22 +++++++++++-----------
drivers/staging/comedi/drivers/ni_tio.h | 2 +-
drivers/staging/comedi/drivers/ni_tiocmd.c | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index df2f3b0..e052b64 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -886,7 +886,7 @@ static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
int retval;
struct ni_gpct *counter = subdev_to_counter(s);
-/* const struct comedi_cmd *cmd = &s->async->cmd; */
+ /* struct comedi_kcmd *cmd = &s->async->cmd; */
retval = ni_660x_request_mite_channel(dev, counter, COMEDI_INPUT);
if (retval) {
@@ -901,7 +901,7 @@ static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
}
static int ni_660x_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd)
+ struct comedi_subdevice *s, struct comedi_kcmd *cmd)
{
struct ni_gpct *counter = subdev_to_counter(s);
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 87995da..42df600 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -220,7 +220,7 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
static int ni_cdio_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd);
+ struct comedi_subdevice *s, struct comedi_kcmd *cmd);
static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
static int ni_cdio_cancel(struct comedi_device *dev,
struct comedi_subdevice *s);
@@ -317,7 +317,7 @@ static int ni_gpct_insn_config(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data);
static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
static int ni_gpct_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd);
+ struct comedi_subdevice *s, struct comedi_kcmd *cmd);
static int ni_gpct_cancel(struct comedi_device *dev,
struct comedi_subdevice *s);
static void handle_gpct_interrupt(struct comedi_device *dev,
@@ -1259,7 +1259,7 @@ static void ni_ao_fifo_load(struct comedi_device *dev,
struct comedi_subdevice *s, int n)
{
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
int chan;
int i;
short d;
@@ -2162,7 +2162,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
}
static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
- struct comedi_cmd *cmd)
+ struct comedi_kcmd *cmd)
{
int err = 0;
int tmp;
@@ -2381,7 +2381,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct comedi_cmd *cmd = &s->async->cmd;
+ const struct comedi_kcmd *cmd = &s->async->cmd;
int timer;
int mode1 = 0; /* mode1 is needed for both stop and convert */
int mode2 = 0;
@@ -3151,7 +3151,7 @@ static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct comedi_cmd *cmd = &s->async->cmd;
+ const struct comedi_kcmd *cmd = &s->async->cmd;
int bits;
int i;
unsigned trigvar;
@@ -3353,7 +3353,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
}
static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
- struct comedi_cmd *cmd)
+ struct comedi_kcmd *cmd)
{
int err = 0;
int tmp;
@@ -3641,7 +3641,7 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev,
}
static int ni_cdio_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd)
+ struct comedi_subdevice *s, struct comedi_kcmd *cmd)
{
int err = 0;
int tmp;
@@ -3751,7 +3751,7 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,
static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- const struct comedi_cmd *cmd = &s->async->cmd;
+ const struct comedi_kcmd *cmd = &s->async->cmd;
unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit;
int retval;
@@ -5228,7 +5228,7 @@ static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
int retval;
#ifdef PCIDMA
struct ni_gpct *counter = s->private;
-/* const struct comedi_cmd *cmd = &s->async->cmd; */
+ /* struct comedi_kcmd *cmd = &s->async->cmd; */
retval = ni_request_gpct_mite_channel(dev, counter->counter_index,
COMEDI_INPUT);
@@ -5247,7 +5247,7 @@ static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
}
static int ni_gpct_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd)
+ struct comedi_subdevice *s, struct comedi_kcmd *cmd)
{
#ifdef PCIDMA
struct ni_gpct *counter = s->private;
diff --git a/drivers/staging/comedi/drivers/ni_tio.h b/drivers/staging/comedi/drivers/ni_tio.h
index b058820..1766852 100644
--- a/drivers/staging/comedi/drivers/ni_tio.h
+++ b/drivers/staging/comedi/drivers/ni_tio.h
@@ -155,7 +155,7 @@ extern int ni_tio_insn_config(struct ni_gpct *counter,
extern int ni_tio_winsn(struct ni_gpct *counter,
struct comedi_insn *insn, unsigned int *data);
extern int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async);
-extern int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd);
+extern int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_kcmd *cmd);
extern int ni_tio_cancel(struct ni_gpct *counter);
extern void ni_tio_handle_interrupt(struct ni_gpct *counter,
struct comedi_subdevice *s);
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index a961158..0c3c178 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -124,7 +124,7 @@ static int ni_tio_input_inttrig(struct comedi_device *dev,
static int ni_tio_input_cmd(struct ni_gpct *counter, struct comedi_async *async)
{
struct ni_gpct_device *counter_dev = counter->counter_dev;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
int retval = 0;
/* write alloc the entire buffer */
@@ -184,7 +184,7 @@ static int ni_tio_output_cmd(struct ni_gpct *counter,
static int ni_tio_cmd_setup(struct ni_gpct *counter, struct comedi_async *async)
{
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
int set_gate_source = 0;
unsigned gate_source;
int retval = 0;
@@ -212,7 +212,7 @@ static int ni_tio_cmd_setup(struct ni_gpct *counter, struct comedi_async *async)
int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)
{
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
int retval = 0;
unsigned long flags;
@@ -234,7 +234,7 @@ int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async)
}
EXPORT_SYMBOL_GPL(ni_tio_cmd);
-int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
+int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_kcmd *cmd)
{
int err = 0;
int tmp;
--
1.7.12
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
