]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: icp_multi: remove ao_maxdata from boardinfo
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 11 Sep 2012 20:47:20 +0000 (13:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Sep 2012 21:01:56 +0000 (14:01 -0700)
The analog outputs of this board always have 12-bit resolution.
Remove the boardinfo and just open-code the value.

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>
drivers/staging/comedi/drivers/icp_multi.c

index 35f5f31b02c15dddca4a6058a30fe0658040d5c7..3a28f914538fa29725b041f58542925c84b1160d 100644 (file)
@@ -131,7 +131,6 @@ struct boardtype {
        char have_irq;          /*  1=card support IRQ */
        char cardtype;          /*  0=ICP Multi */
        int ai_maxdata;         /*  resolution of A/D */
-       int ao_maxdata;         /*  resolution of D/A */
        const struct comedi_lrange *rangelist_ai;       /*  rangelist for A/D */
        const char *rangecode;  /*  range codes for programming */
        const struct comedi_lrange *rangelist_ao;       /*  rangelist for D/A */
@@ -815,7 +814,7 @@ static int icp_multi_attach(struct comedi_device *dev,
        s->type = COMEDI_SUBD_AO;
        s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 4;
-       s->maxdata = this_board->ao_maxdata;
+       s->maxdata = 0x0fff;
        s->len_chanlist = 4;
        s->range_table = &range_analog;
        s->insn_write = icp_multi_insn_write_ao;
@@ -884,7 +883,6 @@ static const struct boardtype boardtypes[] = {
                .have_irq       = 1,
                .cardtype       = TYPE_ICP_MULTI,
                .ai_maxdata     = 0x0fff,
-               .ao_maxdata     = 0x0fff,
                .rangelist_ai   = &range_analog,
                .rangecode      = range_codes_analog,
                .rangelist_ao   = &range_analog,