From 1a7be76e6a66230c8a91670c21949bb3742c54a5 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 11 Sep 2012 13:45:31 -0700 Subject: [PATCH] --- yaml --- r: 325184 b: refs/heads/master c: 5b93da54bf0a55fd53b96cfb1ac0ce0f8905d1e0 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/icp_multi.c | 27 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 344b851c6b4a..d7284514a4a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 888866625c089f949d810639d62d85ab3d276c05 +refs/heads/master: 5b93da54bf0a55fd53b96cfb1ac0ce0f8905d1e0 diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c index 3567a481bf0c..6924b1d5306a 100644 --- a/trunk/drivers/staging/comedi/drivers/icp_multi.c +++ b/trunk/drivers/staging/comedi/drivers/icp_multi.c @@ -135,7 +135,6 @@ struct boardtype { int n_aochan; /* num of D/A chans */ int n_dichan; /* num of DI chans */ int n_dochan; /* num of DO chans */ - int n_ctrs; /* num of counters */ int ai_maxdata; /* resolution of A/D */ int ao_maxdata; /* resolution of D/A */ const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */ @@ -781,8 +780,7 @@ static int icp_multi_attach(struct comedi_device *dev, n_subdevices++; if (this_board->n_dochan) n_subdevices++; - if (this_board->n_ctrs) - n_subdevices++; + n_subdevices++; ret = comedi_alloc_subdevices(dev, n_subdevices); if (ret) @@ -866,18 +864,16 @@ static int icp_multi_attach(struct comedi_device *dev, subdev++; } - if (this_board->n_ctrs) { - s = &dev->subdevices[subdev]; - s->type = COMEDI_SUBD_COUNTER; - s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = this_board->n_ctrs; - s->maxdata = 0xffff; - s->len_chanlist = this_board->n_ctrs; - s->state = 0; - s->insn_read = icp_multi_insn_read_ctr; - s->insn_write = icp_multi_insn_write_ctr; - subdev++; - } + s = &dev->subdevices[subdev]; + s->type = COMEDI_SUBD_COUNTER; + s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; + s->n_chan = 4; + s->maxdata = 0xffff; + s->len_chanlist = 4; + s->state = 0; + s->insn_read = icp_multi_insn_read_ctr; + s->insn_write = icp_multi_insn_write_ctr; + subdev++; devpriv->valid = 1; @@ -911,7 +907,6 @@ static const struct boardtype boardtypes[] = { .n_aochan = 4, .n_dichan = 16, .n_dochan = 8, - .n_ctrs = 4, .ai_maxdata = 0x0fff, .ao_maxdata = 0x0fff, .rangelist_ai = &range_analog,