[PATCH 37/50] staging: comedi: pcl816: use struct comedi_kcmd

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

diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index f65fd66..042ba83 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -193,7 +193,7 @@ static int set_rtc_irq_bit(unsigned char bit);
 
 static int pcl816_ai_cmdtest(struct comedi_device *dev,
 			     struct comedi_subdevice *s,
-			     struct comedi_cmd *cmd);
+			     struct comedi_kcmd *cmd);
 static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);
 
 /*
@@ -432,7 +432,7 @@ static irqreturn_t interrupt_pcl816(int irq, void *d)
 ==============================================================================
    COMMAND MODE
 */
-static void pcl816_cmdtest_out(int e, struct comedi_cmd *cmd)
+static void pcl816_cmdtest_out(int e, struct comedi_kcmd *cmd)
 {
 	printk(KERN_INFO "pcl816 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e,
 	       cmd->start_src, cmd->scan_begin_src, cmd->convert_src);
@@ -448,7 +448,8 @@ static void pcl816_cmdtest_out(int e, struct comedi_cmd *cmd)
 ==============================================================================
 */
 static int pcl816_ai_cmdtest(struct comedi_device *dev,
-			     struct comedi_subdevice *s, struct comedi_cmd *cmd)
+			     struct comedi_subdevice *s,
+			     struct comedi_kcmd *cmd)
 {
 	const struct pcl816_board *board = comedi_board(dev);
 	int err = 0;
@@ -579,7 +580,7 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
 	const struct pcl816_board *board = comedi_board(dev);
 	unsigned int divisor1 = 0, divisor2 = 0, dma_flags, bytes, dmairq;
-	struct comedi_cmd *cmd = &s->async->cmd;
+	struct comedi_kcmd *cmd = &s->async->cmd;
 	unsigned int seglen;
 
 	if (cmd->start_src != TRIG_NOW)
-- 
1.7.12




More information about the devel mailing list