From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 4 Sep 2014 17:39:33 +0000 (-0700)
Subject: staging: comedi: adl_pci9118: refactor 'ai_maxdata' in boardinfo
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0972008b2dfa2161ff1223214f5aae574bfe803;p=linux-beck.git

staging: comedi: adl_pci9118: refactor 'ai_maxdata' in boardinfo

The boards supported by this driver either have 12-bit or 16-bit analog
inputs. For aesthetics, replace the 'ai_maxdata' member in the boardinfo
with a bit-field flag, 'ai_is_16bit', and refactor the subdevice init to
use the new member.

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/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index f8214273ec2c..333c68f5d5a2 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -231,7 +231,7 @@ static const struct comedi_lrange pci9118hg_ai_range = {
 struct boardtype {
 	const char *name;		/* board name */
 	int device_id;			/* PCI device ID of card */
-	int ai_maxdata;			/* resolution of A/D */
+	unsigned int ai_is_16bit:1;
 	unsigned int is_hg:1;
 };
 
@@ -239,16 +239,14 @@ static const struct boardtype boardtypes[] = {
 	{
 		.name		= "pci9118dg",
 		.device_id	= 0x80d9,
-		.ai_maxdata	= 0x0fff,
 	}, {
 		.name		= "pci9118hg",
 		.device_id	= 0x80d9,
-		.ai_maxdata	= 0x0fff,
 		.is_hg		= 1,
 	}, {
 		.name		= "pci9118hr",
 		.device_id	= 0x80d9,
-		.ai_maxdata	= 0xffff,
+		.ai_is_16bit	= 1,
 	},
 };
 
@@ -1871,7 +1869,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq,
 	else
 		s->n_chan = 16;
 
-	s->maxdata = this_board->ai_maxdata;
+	s->maxdata = this_board->ai_is_16bit ? 0xffff : 0x0fff;
 	s->range_table = this_board->is_hg ? &pci9118hg_ai_range
 					   : &pci9118_ai_range;
 	s->insn_read = pci9118_insn_read_ai;