[PATCH 42/50] staging: comedi: s626: use struct comedi_kcmd

Ian Abbott abbotti at mev.co.uk
Tue Sep 18 18:46:51 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/s626.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index f90578e..4ee150d 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -779,7 +779,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct comedi_subdevice *s;
-	struct comedi_cmd *cmd;
+	struct comedi_kcmd *cmd;
 	struct enc_private *k;
 	unsigned long flags;
 	int32_t *readaddr;
@@ -1016,7 +1016,7 @@ static void ResetADC(struct comedi_device *dev, uint8_t *ppl)
 	uint16_t i;
 	uint16_t n;
 	uint32_t LocalPPL;
-	struct comedi_cmd *cmd = &(dev->subdevices->async->cmd);
+	struct comedi_kcmd *cmd = &dev->subdevices[0].async->cmd;
 
 	/*  Stop RPS program in case it is currently running. */
 	MC_DISABLE(P_MC1, MC1_ERPS1);
@@ -1325,7 +1325,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,
 	return n;
 }
 
-static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_cmd *cmd)
+static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_kcmd *cmd)
 {
 
 	int n;
@@ -1423,7 +1423,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
 
 	uint8_t ppl[16];
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_kcmd *cmd = &s->async->cmd;
 	struct enc_private *k;
 	int tick;
 
@@ -1543,7 +1543,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 }
 
 static int s626_ai_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;
-- 
1.7.12




More information about the devel mailing list