From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 17 Feb 2014 21:26:51 +0000 (-0700)
Subject: staging: comedi: pcl812: rename 'haveMPC508' in boardinfo
X-Git-Tag: v3.15-rc1~139^2~987
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fef20bff22ae3f27e9302266940a3e437984cd6a;p=~emulex%2Finfiniband.git

staging: comedi: pcl812: rename 'haveMPC508' in boardinfo

Rename this CamelCase member in the boardinfo and change it to a bit-
field flag.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 7f3d3208009..cbbadb82e65 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -341,7 +341,7 @@ struct pcl812_board {
 	const struct comedi_lrange *rangelist_ai;
 	unsigned int IRQbits;
 	unsigned int has_dma:1;
-	unsigned char haveMPC508;
+	unsigned int has_mpc508_mux:1;
 };
 
 static const struct pcl812_board boardtypes[] = {
@@ -394,7 +394,7 @@ static const struct pcl812_board boardtypes[] = {
 		.rangelist_ai	= &range_acl8112dg_ai,
 		.IRQbits	= 0xdcfc,
 		.has_dma	= 1,
-		.haveMPC508	= 1,
+		.has_mpc508_mux	= 1,
 	}, {
 		.name		= "acl8112hg",
 		.board_type	= boardACL8112,
@@ -408,7 +408,7 @@ static const struct pcl812_board boardtypes[] = {
 		.rangelist_ai	= &range_acl8112hg_ai,
 		.IRQbits	= 0xdcfc,
 		.has_dma	= 1,
-		.haveMPC508	= 1,
+		.has_mpc508_mux	= 1,
 	}, {
 		.name		= "a821pgl",
 		.board_type	= boardA821,
@@ -531,7 +531,7 @@ static const struct pcl812_board boardtypes[] = {
 		.rangelist_ai	= &range_pcl813b2_ai,
 		.IRQbits	= 0xdcfc,
 		.has_dma	= 1,
-		.haveMPC508	= 1,
+		.has_mpc508_mux	= 1,
 	}, {
 		.name		= "a826pg",
 		.board_type	= boardACL8216,
@@ -1401,7 +1401,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		else
 			s->insn_read = pcl812_ai_insn_read;
 
-		devpriv->use_MPC = board->haveMPC508;
+		devpriv->use_MPC = board->has_mpc508_mux;
 		if (dev->irq) {
 			dev->read_subdev = s;
 			s->subdev_flags |= SDF_CMD_READ;