From 73804c65a9156e489d36c4427f3b230a1eda5974 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 25 Jun 2012 16:37:10 -0700
Subject: [PATCH] --- yaml --- r: 317595 b: refs/heads/master c:
 16a8cdfc13526983f6c55e35c09bbe091ac11e96 h: refs/heads/master i:   317593:
 649964f251f57489967be92b81dce7813b457ae3   317591:
 8c2563ce8aae9c5a9f0f7cc7895be39685a6ee8d v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_das16_cs.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a424ca20b37d..42e99359aef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae7df43422cc0afdd5a808638dd7935ad752c62e
+refs/heads/master: 16a8cdfc13526983f6c55e35c09bbe091ac11e96
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
index e0821b9b6211..496c3312837e 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -85,7 +85,6 @@ static const struct das16cs_board das16cs_boards[] = {
 };
 
 #define n_boards ARRAY_SIZE(das16cs_boards)
-#define thisboard ((const struct das16cs_board *)dev->board_ptr)
 
 struct das16cs_private {
 	struct pcmcia_device *link;
@@ -94,7 +93,6 @@ struct das16cs_private {
 	unsigned short status1;
 	unsigned short status2;
 };
-#define devpriv ((struct das16cs_private *)dev->private)
 
 static struct pcmcia_device *cur_dev;
 
@@ -120,6 +118,7 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
 			    struct comedi_insn *insn, unsigned int *data)
 {
+	struct das16cs_private *devpriv = dev->private;
 	int i;
 	int to;
 	int aref;
@@ -328,6 +327,7 @@ static int das16cs_ao_winsn(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
 			    struct comedi_insn *insn, unsigned int *data)
 {
+	struct das16cs_private *devpriv = dev->private;
 	int i;
 	int chan = CR_CHAN(insn->chanspec);
 	unsigned short status1;
@@ -375,6 +375,7 @@ static int das16cs_ao_rinsn(struct comedi_device *dev,
 			    struct comedi_subdevice *s,
 			    struct comedi_insn *insn, unsigned int *data)
 {
+	struct das16cs_private *devpriv = dev->private;
 	int i;
 	int chan = CR_CHAN(insn->chanspec);
 
@@ -411,6 +412,7 @@ static int das16cs_dio_insn_config(struct comedi_device *dev,
 				   struct comedi_subdevice *s,
 				   struct comedi_insn *insn, unsigned int *data)
 {
+	struct das16cs_private *devpriv = dev->private;
 	int chan = CR_CHAN(insn->chanspec);
 	int bits;
 
@@ -478,6 +480,7 @@ static const struct das16cs_board *das16cs_probe(struct comedi_device *dev,
 static int das16cs_attach(struct comedi_device *dev,
 			  struct comedi_devconfig *it)
 {
+	const struct das16cs_board *thisboard;
 	struct pcmcia_device *link;
 	struct comedi_subdevice *s;
 	int ret;
@@ -509,6 +512,7 @@ static int das16cs_attach(struct comedi_device *dev,
 	dev->board_ptr = das16cs_probe(dev, link);
 	if (!dev->board_ptr)
 		return -EIO;
+	thisboard = comedi_board(dev);
 
 	dev->board_name = thisboard->name;