staging: comedi: cb_pcimdda: remove ao_chans and ao_bits from boardinfo

PATCH In review H Hartley Sweeten 1 participant 1 message Aug 17, 2012 Staging

lore

Share & tools

lore

H Hartley Sweeten

author

2012-08-17 02:52 UTC #0 lore raw

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 <[email protected]>

Cc Ian Abbott <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/comedi/drivers/cb_pcimdda.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

drivers/staging/comedi/drivers/cb_pcimdda.c +2 -6

index 0e34603..82fb5f6 100644
@@ -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;

Signature · 1 line

1.7.11