Commit c5f76405 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_labpc: remove some unnecessary defines

The EEPROM_SIZE and NUM_AO_CHAN defines are only used once and they
don't add any significant clarity to the driver. They are also pretty
generic symbol names. Remove them and just open code the values.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f91e45e2
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#ifndef _NI_LABPC_H #ifndef _NI_LABPC_H
#define _NI_LABPC_H #define _NI_LABPC_H
#define EEPROM_SIZE 256 /* 256 byte eeprom */
#define NUM_AO_CHAN 2 /* boards have two analog output channels */
enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer, enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer,
isa_dma_transfer isa_dma_transfer
}; };
......
...@@ -1261,7 +1261,7 @@ int labpc_common_attach(struct comedi_device *dev, ...@@ -1261,7 +1261,7 @@ int labpc_common_attach(struct comedi_device *dev,
if (board->has_ao) { if (board->has_ao) {
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND;
s->n_chan = NUM_AO_CHAN; s->n_chan = 2;
s->maxdata = 0x0fff; s->maxdata = 0x0fff;
s->range_table = &range_labpc_ao; s->range_table = &range_labpc_ao;
s->insn_write = labpc_ao_insn_write; s->insn_write = labpc_ao_insn_write;
...@@ -1307,12 +1307,12 @@ int labpc_common_attach(struct comedi_device *dev, ...@@ -1307,12 +1307,12 @@ int labpc_common_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
/* EEPROM */ /* EEPROM (256 bytes) */
s = &dev->subdevices[4]; s = &dev->subdevices[4];
if (board->is_labpc1200) { if (board->is_labpc1200) {
s->type = COMEDI_SUBD_MEMORY; s->type = COMEDI_SUBD_MEMORY;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;
s->n_chan = EEPROM_SIZE; s->n_chan = 256;
s->maxdata = 0xff; s->maxdata = 0xff;
s->insn_write = labpc_eeprom_insn_write; s->insn_write = labpc_eeprom_insn_write;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment