Use `struct comedi_kcmd` instead of `struct comedi_cmd`.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
drivers/staging/comedi/drivers/amplc_pci230.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 4c9f131..20b7bbd 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -951,7 +951,8 @@ static int pci230_ao_rinsn(struct comedi_device *dev,
}
static int pci230_ao_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd)
+ struct comedi_subdevice *s,
+ struct comedi_kcmd *cmd)
{
const struct pci230_board *thisboard = comedi_board(dev);
struct pci230_private *devpriv = dev->private;
@@ -1171,7 +1172,7 @@ static void pci230_ao_stop(struct comedi_device *dev,
unsigned long irqflags;
unsigned char intsrc;
int started;
- struct comedi_cmd *cmd;
+ struct comedi_kcmd *cmd;
spin_lock_irqsave(&devpriv->ao_stop_spinlock, irqflags);
started = test_and_clear_bit(AO_CMD_STARTED, &devpriv->state);
@@ -1223,7 +1224,7 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,
short data;
int i, ret;
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
if (!devpriv->ao_continuous && (devpriv->ao_scan_count == 0))
return;
@@ -1257,7 +1258,7 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev,
{
struct pci230_private *devpriv = dev->private;
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
unsigned int num_scans;
unsigned int room;
unsigned short dacstat;
@@ -1395,7 +1396,7 @@ static void pci230_ao_start(struct comedi_device *dev,
{
struct pci230_private *devpriv = dev->private;
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
unsigned long irqflags;
set_bit(AO_CMD_STARTED, &devpriv->state);
@@ -1500,7 +1501,7 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
unsigned int range;
/* Get the command. */
- struct comedi_cmd *cmd = &s->async->cmd;
+ struct comedi_kcmd *cmd = &s->async->cmd;
if (cmd->scan_begin_src == TRIG_TIMER) {
/* Claim Z2-CT1. */
@@ -1578,7 +1579,7 @@ static int pci230_ao_cancel(struct comedi_device *dev,
return 0;
}
-static int pci230_ai_check_scan_period(struct comedi_cmd *cmd)
+static int pci230_ai_check_scan_period(struct comedi_kcmd *cmd)
{
unsigned int min_scan_period, chanlist_len;
int err = 0;
@@ -1603,7 +1604,8 @@ static int pci230_ai_check_scan_period(struct comedi_cmd *cmd)
}
static int pci230_ai_cmdtest(struct comedi_device *dev,
- struct comedi_subdevice *s, struct comedi_cmd *cmd)
+ struct comedi_subdevice *s,
+ struct comedi_kcmd *cmd)
{
const struct pci230_board *thisboard = comedi_board(dev);
struct pci230_private *devpriv = dev->private;
@@ -1989,7 +1991,7 @@ static void pci230_ai_update_fifo_trigger_level(struct comedi_device *dev,
struct comedi_subdevice *s)
{
struct pci230_private *devpriv = dev->private;
- struct comedi_cmd *cmd = &s->async->cmd;
+ struct comedi_kcmd *cmd = &s->async->cmd;
unsigned int scanlen = cmd->scan_end_arg;
unsigned int wake;
unsigned short triglev;
@@ -2101,7 +2103,7 @@ static void pci230_ai_stop(struct comedi_device *dev,
{
struct pci230_private *devpriv = dev->private;
unsigned long irqflags;
- struct comedi_cmd *cmd;
+ struct comedi_kcmd *cmd;
int started;
spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags);
@@ -2149,7 +2151,7 @@ static void pci230_ai_start(struct comedi_device *dev,
unsigned long irqflags;
unsigned short conv;
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
set_bit(AI_CMD_STARTED, &devpriv->state);
if (!devpriv->ai_continuous && (devpriv->ai_scan_count == 0)) {
@@ -2397,7 +2399,7 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* Get the command. */
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
/*
* Determine which shared resources are needed.
--
1.7.12
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
