From d749e38b7a8da1fa2777bf109e8c65f6164d6583 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 3 Apr 2013 11:40:13 -0700
Subject: [PATCH] --- yaml --- r: 363863 b: refs/heads/master c:
 dcc2358fa4d5724b9284b1d5e48aad2d838bf18e h: refs/heads/master i:   363861:
 905697a35a874164a87fb2d0824e0af837f90037   363859:
 d336a4d46fdca9daa1efdda60b6875d2f3652b4a   363855:
 bf9dbe03999e49183ce7469ca061d48286a7e835 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/rtd520.c | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 5d085fec7605..53cf34045809 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bc1bd1fc0ca10342495018c09addaf26a7c40d9
+refs/heads/master: dcc2358fa4d5724b9284b1d5e48aad2d838bf18e
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
index 2786080006b3..5e0ea46a6987 100644
--- a/trunk/drivers/staging/comedi/drivers/rtd520.c
+++ b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -366,24 +366,24 @@ enum rtd_boardid {
 	BOARD_PCI4520,
 };
 
-struct rtdBoard {
+struct rtd_boardinfo {
 	const char *name;
-	int range10Start;	/* start of +-10V range */
-	int rangeUniStart;	/* start of +10V range */
+	int range_bip10;	/* start of +-10V range */
+	int range_uni10;	/* start of +10V range */
 	const struct comedi_lrange *ai_range;
 };
 
-static const struct rtdBoard rtd520Boards[] = {
+static const struct rtd_boardinfo rtd520Boards[] = {
 	[BOARD_DM7520] = {
 		.name		= "DM7520",
-		.range10Start	= 6,
-		.rangeUniStart	= 12,
+		.range_bip10	= 6,
+		.range_uni10	= 12,
 		.ai_range	= &rtd_ai_7520_range,
 	},
 	[BOARD_PCI4520] = {
 		.name		= "PCI4520",
-		.range10Start	= 8,
-		.rangeUniStart	= 16,
+		.range_bip10	= 8,
+		.range_uni10	= 16,
 		.ai_range	= &rtd_ai_4520_range,
 	},
 };
@@ -469,7 +469,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode)
 static unsigned short rtdConvertChanGain(struct comedi_device *dev,
 					 unsigned int comediChan, int chanIndex)
 {				/* index in channel list */
-	const struct rtdBoard *thisboard = comedi_board(dev);
+	const struct rtd_boardinfo *thisboard = comedi_board(dev);
 	struct rtd_private *devpriv = dev->private;
 	unsigned int chan, range, aref;
 	unsigned short r = 0;
@@ -481,20 +481,20 @@ static unsigned short rtdConvertChanGain(struct comedi_device *dev,
 	r |= chan & 0xf;
 
 	/* Note: we also setup the channel list bipolar flag array */
-	if (range < thisboard->range10Start) {
+	if (range < thisboard->range_bip10) {
 		/* +-5 range */
 		r |= 0x000;
 		r |= (range & 0x7) << 4;
 		CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
-	} else if (range < thisboard->rangeUniStart) {
+	} else if (range < thisboard->range_uni10) {
 		/* +-10 range */
 		r |= 0x100;
-		r |= ((range - thisboard->range10Start) & 0x7) << 4;
+		r |= ((range - thisboard->range_bip10) & 0x7) << 4;
 		CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
 	} else {
 		/* +10 range */
 		r |= 0x200;
-		r |= ((range - thisboard->rangeUniStart) & 0x7) << 4;
+		r |= ((range - thisboard->range_uni10) & 0x7) << 4;
 		CHAN_ARRAY_CLEAR(devpriv->chanBipolar, chanIndex);
 	}
 
@@ -1332,7 +1332,7 @@ static int rtd_auto_attach(struct comedi_device *dev,
 			   unsigned long context)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-	const struct rtdBoard *thisboard = NULL;
+	const struct rtd_boardinfo *thisboard = NULL;
 	struct rtd_private *devpriv;
 	struct comedi_subdevice *s;
 	int ret;