From: H Hartley Sweeten Date: Wed, 19 Feb 2014 17:11:21 +0000 (-0700) Subject: staging: comedi: pcl816: remove 'n_aochan' from boardinfo X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=31baee58a6c797f399e8b673e5db96a7aeccef44;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: pcl816: remove 'n_aochan' from boardinfo This member of the boardinfo is the same for all board types. Remove this data from the boardinfo. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index cabc5fe26df6..b76e9d6f9386 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -87,7 +87,6 @@ static const struct comedi_lrange range_pcl816 = { struct pcl816_board { const char *name; - int n_aochan; unsigned int IRQbits; int ai_maxdata; int ao_maxdata; @@ -97,14 +96,12 @@ struct pcl816_board { static const struct pcl816_board boardtypes[] = { { .name = "pcl816", - .n_aochan = 1, .IRQbits = 0x00fc, .ai_maxdata = 0xffff, .ao_maxdata = 0xffff, .ai_chanlist = 1024, }, { .name = "pcl814b", - .n_aochan = 1, .IRQbits = 0x00fc, .ai_maxdata = 0x3fff, .ao_maxdata = 0x3fff, @@ -890,7 +887,7 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) #if 0 subdevs[1] = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE | SDF_GROUND; - s->n_chan = board->n_aochan; + s->n_chan = 1; s->maxdata = board->ao_maxdata; s->range_table = &range_pcl816; break;