[PATCH 34/50] staging: comedi: ni_pcidio: use struct comedi_kcmd

Ian Abbott abbotti at mev.co.uk
Tue Sep 18 18:46:43 UTC 2012


Use `struct comedi_kcmd` instead of `struct comedi_cmd`.

Signed-off-by: Ian Abbott <abbotti at mev.co.uk>
---
 drivers/staging/comedi/drivers/ni_pcidio.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 6a70e26..526359b 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -313,7 +313,7 @@ struct nidio96_private {
 
 static int ni_pcidio_cmdtest(struct comedi_device *dev,
 			     struct comedi_subdevice *s,
-			     struct comedi_cmd *cmd);
+			     struct comedi_kcmd *cmd);
 static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
 static int ni_pcidio_inttrig(struct comedi_device *dev,
 			     struct comedi_subdevice *s, unsigned int trignum);
@@ -678,7 +678,8 @@ static int ni_pcidio_insn_bits(struct comedi_device *dev,
 }
 
 static int ni_pcidio_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;
@@ -812,7 +813,7 @@ static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode)
 
 static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_kcmd *cmd = &s->async->cmd;
 
 	/* XXX configure ports for input */
 	writel(0x0000, devpriv->mite->daq_io_addr + Port_Pin_Directions(0));
-- 
1.7.12




More information about the devel mailing list