[<prev] [next>] [day] [month] [year] [list]
Message-ID: <201208161952.30362.hartleys@visionengravers.com>
Date: Thu, 16 Aug 2012 19:52:30 -0700
From: H Hartley Sweeten <hartleys@...ionengravers.com>
To: Linux Kernel <linux-kernel@...r.kernel.org>
CC: <devel@...verdev.osuosl.org>, <abbotti@....co.uk>,
<gregkh@...uxfoundation.org>
Subject: [PATCH 27/35] staging: comedi: cb_pcimdda: remove ao_chans and ao_bits from boardinfo
This board always has 6, 16-bit analog outputs. There is no need to carry
this information in the boardinfo. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
Cc: Ian Abbott <abbotti@....co.uk>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/staging/comedi/drivers/cb_pcimdda.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 0e34603..82fb5f6 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -105,16 +105,12 @@ Configuration Options:
struct cb_pcimdda_board {
const char *name;
unsigned short device_id;
- int ao_chans;
- int ao_bits;
};
static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
{
.name = "cb_pcimdda06-16",
.device_id = PCI_ID_PCIM_DDA06_16,
- .ao_chans = 6,
- .ao_bits = 16,
}
};
@@ -258,8 +254,8 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
/* analog output subdevice */
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
- s->n_chan = thisboard->ao_chans;
- s->maxdata = (1 << thisboard->ao_bits) - 1;
+ s->n_chan = 6;
+ s->maxdata = 0xffff;
/* this is hard-coded here */
if (it->options[2])
s->range_table = &range_bipolar10;
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists