Use `struct comedi_kcmd` instead of `struct comedi_cmd`.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
drivers/staging/comedi/drivers/das1800.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 5aca8fb..641de92 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -502,7 +502,7 @@ static void das1800_handle_fifo_half_full(struct comedi_device *dev,
struct comedi_subdevice *s)
{
int numPoints = 0; /* number of points to read */
- struct comedi_cmd *cmd = &s->async->cmd;
+ struct comedi_kcmd *cmd = &s->async->cmd;
numPoints = FIFO_SIZE / 2;
/* if we only need some of the points */
@@ -522,7 +522,7 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev,
{
short dpnt;
int unipolar;
- struct comedi_cmd *cmd = &s->async->cmd;
+ struct comedi_kcmd *cmd = &s->async->cmd;
unipolar = inb(dev->iobase + DAS1800_CONTROL_C) & UB;
@@ -549,7 +549,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
unsigned int channel, uint16_t *buffer)
{
unsigned int num_bytes, num_samples;
- struct comedi_cmd *cmd = &s->async->cmd;
+ struct comedi_kcmd *cmd = &s->async->cmd;
disable_dma(channel);
@@ -658,7 +658,7 @@ static void das1800_ai_handler(struct comedi_device *dev)
{
struct comedi_subdevice *s = &dev->subdevices[0];
struct comedi_async *async = s->async;
- struct comedi_cmd *cmd = &async->cmd;
+ struct comedi_kcmd *cmd = &async->cmd;
unsigned int status = inb(dev->iobase + DAS1800_STATUS);
async->events = 0;
@@ -781,7 +781,7 @@ static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode)
/* test analog input cmd */
static int das1800_ai_do_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
- struct comedi_cmd *cmd)
+ struct comedi_kcmd *cmd)
{
int err = 0;
int tmp;
@@ -958,7 +958,7 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev,
}
/* returns appropriate bits for control register a, depending on command */
-static int control_a_bits(struct comedi_cmd cmd)
+static int control_a_bits(struct comedi_kcmd cmd)
{
int control_a;
@@ -980,7 +980,7 @@ static int control_a_bits(struct comedi_cmd cmd)
}
/* returns appropriate bits for control register c, depending on command */
-static int control_c_bits(struct comedi_cmd cmd)
+static int control_c_bits(struct comedi_kcmd cmd)
{
int control_c;
int aref;
@@ -1047,7 +1047,7 @@ static int das1800_set_frequency(struct comedi_device *dev)
}
/* sets up counters */
-static int setup_counters(struct comedi_device *dev, struct comedi_cmd cmd)
+static int setup_counters(struct comedi_device *dev, struct comedi_kcmd cmd)
{
/* setup cascaded counters for conversion/scan frequency */
switch (cmd.scan_begin_src) {
@@ -1087,7 +1087,7 @@ static int setup_counters(struct comedi_device *dev, struct comedi_cmd cmd)
}
/* utility function that suggests a dma transfer size based on the conversion period 'ns' */
-static unsigned int suggest_transfer_size(struct comedi_cmd *cmd)
+static unsigned int suggest_transfer_size(struct comedi_kcmd *cmd)
{
unsigned int size = DMA_BUF_SIZE;
static const int sample_size = 2; /* size in bytes of one sample from board */
@@ -1125,7 +1125,7 @@ static unsigned int suggest_transfer_size(struct comedi_cmd *cmd)
}
/* sets up dma */
-static void setup_dma(struct comedi_device *dev, struct comedi_cmd cmd)
+static void setup_dma(struct comedi_device *dev, struct comedi_kcmd cmd)
{
unsigned long lock_flags;
const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
@@ -1163,7 +1163,7 @@ static void setup_dma(struct comedi_device *dev, struct comedi_cmd cmd)
}
/* programs channel/gain list into card */
-static void program_chanlist(struct comedi_device *dev, struct comedi_cmd cmd)
+static void program_chanlist(struct comedi_device *dev, struct comedi_kcmd cmd)
{
int i, n, chan_range;
unsigned long irq_flags;
@@ -1196,7 +1196,7 @@ static int das1800_ai_do_cmd(struct comedi_device *dev,
int ret;
int control_a, control_c;
struct comedi_async *async = s->async;
- struct comedi_cmd cmd = async->cmd;
+ struct comedi_kcmd cmd = async->cmd;
if (!dev->irq) {
comedi_error(dev,
--
1.7.12
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
