From 3ab2733b7ce9e20be53f483f626f3d06ff507de3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Oct 2015 17:47:26 -0700 Subject: [PATCH] staging: comedi: cb_pcidas: remove NUM_CHANNELS_* defines These defines don't add any additional clarity to the driver. Just remove them. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/cb_pcidas.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index f27090dc90cb..dee4f8ef6a67 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -72,10 +72,6 @@ #define AI_BUFFER_SIZE 1024 /* max ai fifo size */ #define AO_BUFFER_SIZE 1024 /* max ao fifo size */ -#define NUM_CHANNELS_8800 8 -#define NUM_CHANNELS_7376 1 -#define NUM_CHANNELS_8402 2 -#define NUM_CHANNELS_DAC08 1 /* Control/Status registers */ #define INT_ADCFIFO 0 /* INTERRUPT / ADC FIFO register */ @@ -1459,7 +1455,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, s = &dev->subdevices[4]; s->type = COMEDI_SUBD_CALIB; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; - s->n_chan = NUM_CHANNELS_8800; + s->n_chan = 8; s->maxdata = 0xff; s->insn_write = cb_pcidas_caldac_insn_write; @@ -1477,10 +1473,10 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, s->type = COMEDI_SUBD_CALIB; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; if (board->trimpot == AD7376) { - s->n_chan = NUM_CHANNELS_7376; + s->n_chan = 1; s->maxdata = 0x7f; } else { - s->n_chan = NUM_CHANNELS_8402; + s->n_chan = 2; s->maxdata = 0xff; } s->insn_write = cb_pcidas_trimpot_insn_write; @@ -1499,7 +1495,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, if (board->has_dac08) { s->type = COMEDI_SUBD_CALIB; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; - s->n_chan = NUM_CHANNELS_DAC08; + s->n_chan = 1; s->maxdata = 0xff; s->insn_write = cb_pcidas_dac08_insn_write; -- 2.34.1