From b41b3165acf7ae0f36f93a93dbf40770e958c618 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 17 Mar 2001 03:56:09 +0000
Subject: [PATCH] fix use of cmd->data

---
 comedi/drivers/adl_pci9118.c | 4 ++--
 comedi/drivers/cb_pcidas.c   | 1 -
 comedi/drivers/check_driver  | 4 ++--
 comedi/drivers/das1800.c     | 4 ++--
 comedi/drivers/das800.c      | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index b0aa82a3..31bf1ef8 100644
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -1016,8 +1016,8 @@ static int pci9118_ai_cmd(comedi_device *dev,comedi_subdevice *s)
 	devpriv->ai1234_flags=cmd->flags;
 	devpriv->ai1234_n_chan=cmd->chanlist_len;
 	devpriv->ai1234_chanlist=cmd->chanlist;
-	devpriv->ai1234_data=cmd->data;
-	devpriv->ai1234_data_len=cmd->data_len;
+	devpriv->ai1234_data=s->async->data;
+	devpriv->ai1234_data_len=s->async->data_len;
 	if (cmd->stop_arg==TRIG_COUNT) { devpriv->ai1234_scans=cmd->stop_arg; }
 				else   { devpriv->ai1234_scans=0; }
 	devpriv->ai1234_timer1=0;
diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index ee07cf33..07d66c49 100644
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -458,7 +458,6 @@ static int cb_pcidas_ai_cmd(comedi_device *dev,comedi_subdevice *s)
 	printk("stop_src: %d\n", cmd->stop_src);
 	printk("stop_arg: %d\n", cmd->stop_arg);
 	printk("chanlist_len: %d\n", cmd->chanlist_len);
-	printk("data_len: %d\n", cmd->data_len);
 }
 */
 
diff --git a/comedi/drivers/check_driver b/comedi/drivers/check_driver
index 9af55e72..ec7a7683 100755
--- a/comedi/drivers/check_driver
+++ b/comedi/drivers/check_driver
@@ -183,11 +183,11 @@ if grep -E 'cmd..?data' ${driver} &>/dev/null;then
 	echo "E: uses cmd->data or cmd->data_len"
 fi
 
-if grep -E 'buf_int_ptr++' ${driver} &>/dev/null;then
+if grep 'buf_int_ptr++' ${driver} &>/dev/null;then
 	echo "E: uses buf_int_ptr++"
 fi
 
-if grep -E 'buf_int_count++' ${driver} &>/dev/null;then
+if grep 'buf_int_count++' ${driver} &>/dev/null;then
 	echo "E: uses buf_int_count++"
 fi
 
diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index aa69a31f..81cf3bdd 100644
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -1054,12 +1054,12 @@ static void das1800_handle_fifo_not_empty(comedi_device *dev, comedi_subdevice *
 /* utility function used by das1800 interrupt service routines */
 inline void write_to_buffer(comedi_device *dev, comedi_subdevice *s, sampl_t data_point)
 {
-	if(s->async->buf_int_ptr >= s->async->cmd.data_len )
+	if(s->async->buf_int_ptr >= s->async->data_len )
 	{
 		s->async->buf_int_ptr = 0;
 		comedi_eobuf(dev, s);
 	}
-	*((sampl_t *)((void *)s->async->cmd.data + s->async->buf_int_ptr)) = data_point;
+	*((sampl_t *)((void *)s->async->data + s->async->buf_int_ptr)) = data_point;
 	s->async->cur_chan++;
 	if(s->async->cur_chan >= s->async->cur_chanlist_len)
 	{
diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index b93a318d..652a9a4f 100644
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -344,12 +344,12 @@ static void das800_interrupt(int irq, void *d, struct pt_regs *regs)
 		if(devpriv->count > 0 || devpriv->forever == 1)
 		{
 			/* write data point to buffer */
-			if(async->buf_int_ptr >= async->cmd.data_len )
+			if(async->buf_int_ptr >= async->data_len )
 			{
 				async->buf_int_ptr = 0;
 				comedi_eobuf(dev, s);
 			}
-			*((sampl_t *)((void *)async->cmd.data + async->buf_int_ptr)) = dataPoint;
+			*((sampl_t *)((void *)async->data + async->buf_int_ptr)) = dataPoint;
 			async->cur_chan++;
 			if( async->cur_chan >= async->cur_chanlist_len )
 			{
-- 
2.26.2