[PATCH 39/50] staging: comedi: pcmmio, pcmuio: use struct comedi_kcmd

[Ian Abbott <abbotti@xxxxxxxxx>]

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

Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
 drivers/staging/comedi/drivers/pcm_common.c | 2 +-
 drivers/staging/comedi/drivers/pcm_common.h | 2 +-
 drivers/staging/comedi/drivers/pcmmio.c     | 6 +++---
 drivers/staging/comedi/drivers/pcmuio.c     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcm_common.c b/drivers/staging/comedi/drivers/pcm_common.c
index 474af7b..91c80c8 100644
--- a/drivers/staging/comedi/drivers/pcm_common.c
+++ b/drivers/staging/comedi/drivers/pcm_common.c
@@ -6,7 +6,7 @@
  * the PCM drivers.
  */
 int comedi_pcm_cmdtest(struct comedi_device *dev,
-		       struct comedi_subdevice *s, struct comedi_cmd *cmd)
+		       struct comedi_subdevice *s, struct comedi_kcmd *cmd)
 {
 	int err = 0;
 	unsigned int tmp;
diff --git a/drivers/staging/comedi/drivers/pcm_common.h b/drivers/staging/comedi/drivers/pcm_common.h
index cd4840c..c8467f8 100644
--- a/drivers/staging/comedi/drivers/pcm_common.h
+++ b/drivers/staging/comedi/drivers/pcm_common.h
@@ -3,6 +3,6 @@
 
 extern int comedi_pcm_cmdtest(struct comedi_device *dev,
 			      struct comedi_subdevice *s,
-			      struct comedi_cmd *cmd);
+			      struct comedi_kcmd *cmd);
 
 #endif
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index a10bf0a..bd77b50 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -693,7 +693,7 @@ static int pcmmio_start_intr(struct comedi_device *dev,
 	} else {
 		unsigned bits = 0, pol_bits = 0, n;
 		int nports, firstport, asic, port;
-		struct comedi_cmd *cmd = &s->async->cmd;
+		struct comedi_kcmd *cmd = &s->async->cmd;
 
 		asic = subpriv->dio.intr.asic;
 		if (asic < 0)
@@ -794,7 +794,7 @@ pcmmio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,
  */
 static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_kcmd *cmd = &s->async->cmd;
 	unsigned long flags;
 	int event = 0;
 
@@ -834,7 +834,7 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int
 pcmmio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
-	       struct comedi_cmd *cmd)
+	       struct comedi_kcmd *cmd)
 {
 	return comedi_pcm_cmdtest(dev, s, cmd);
 }
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 0e32119..2afeeb5 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -615,7 +615,7 @@ static int pcmuio_start_intr(struct comedi_device *dev,
 	} else {
 		unsigned bits = 0, pol_bits = 0, n;
 		int nports, firstport, asic, port;
-		struct comedi_cmd *cmd = &s->async->cmd;
+		struct comedi_kcmd *cmd = &s->async->cmd;
 
 		asic = subpriv->intr.asic;
 		if (asic < 0)
@@ -700,7 +700,7 @@ pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,
  */
 static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_kcmd *cmd = &s->async->cmd;
 	unsigned long flags;
 	int event = 0;
 
@@ -740,7 +740,7 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
 static int
 pcmuio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
-	       struct comedi_cmd *cmd)
+	       struct comedi_kcmd *cmd)
 {
 	return comedi_pcm_cmdtest(dev, s, cmd);
 }
-- 
1.7.12

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel