lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: rtd520: remove 'aiChans' and 'aiBits' from boardinfo

Browse Source 
All the boards supported by this driver have the same number of analog
input channels and resolution. Remove the boardinfo for this and just
open-code the values in the attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-29 10:06:34 -07:00
committed by Greg Kroah-Hartman
parent 90973498d4
commit 5d55a30c50
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/rtd520.c
View File

@@ -252,8 +252,6 @@ static const struct comedi_lrange rtd_ao_range = {
struct rtdBoard { struct rtdBoard {
const char *name; const char *name;
int device_id; int device_id;
int aiChans;
int aiBits;
int aiMaxGain; int aiMaxGain;
int range10Start; /* start of +-10V range */ int range10Start; /* start of +-10V range */
int rangeUniStart; /* start of +10V range */ int rangeUniStart; /* start of +10V range */
@@ -263,16 +261,12 @@ static const struct rtdBoard rtd520Boards[] = {
{ {
.name = "DM7520", .name = "DM7520",
.device_id = 0x7520, .device_id = 0x7520,
.aiChans = 16,
.aiBits = 12,
.aiMaxGain = 32, .aiMaxGain = 32,
.range10Start = 6, .range10Start = 6,
.rangeUniStart = 12, .rangeUniStart = 12,
}, { }, {
.name = "PCI4520", .name = "PCI4520",
.device_id = 0x4520, .device_id = 0x4520,
.aiChans = 16,
.aiBits = 12,
.aiMaxGain = 128, .aiMaxGain = 128,
.range10Start = 8, .range10Start = 8,
.rangeUniStart = 16, .rangeUniStart = 16,
@@ -1340,8 +1334,8 @@ static int rtd_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
/* analog input subdevice */ /* analog input subdevice */
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF;
s->n_chan = thisboard->aiChans; s->n_chan = 16;
s->maxdata = (1 << thisboard->aiBits) - 1; s->maxdata = 0x0fff;
if (thisboard->aiMaxGain <= 32) if (thisboard->aiMaxGain <= 32)
s->range_table = &rtd_ai_7520_range; s->range_table = &rtd_ai_7520_range;
else else
@@ -1362,7 +1356,7 @@ static int rtd_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE; s->subdev_flags = SDF_WRITABLE;
s->n_chan = 2; s->n_chan = 2;
s->maxdata = (1 << thisboard->aiBits) - 1; s->maxdata = 0x0fff;
s->range_table = &rtd_ao_range; s->range_table = &rtd_ao_range;
s->insn_write = rtd_ao_winsn; s->insn_write = rtd_ao_winsn;
s->insn_read = rtd_ao_rinsn; s->insn_read = rtd_ao_rinsn;