staging: comedi: adv_pci1710: remove 'has_counter' boardinfo

All the boards supported by this driver have a 8254 counter. Channels
1 and 2 are used to create the cascaded 32-bit analog input pacer.
Counter 0 is available for the user on all the boards except the PCI-1713.

Remove the 'has_counter' boardinfo and use the 'is_pci1713' boardinfo to
determine if the user counter subdevice needs to be allocated and
initialized.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 032d1d41a1398677a8aef9abb64aa543db553a3c..62f9f478421c418b04ac28e683c11ebe1ea8aead 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -138,7 +138,6 @@ struct boardtype {
        unsigned int has_diff_ai:1;
        unsigned int has_ao:1;
        unsigned int has_di_do:1;
-       unsigned int has_counter:1;
 };
 
 static const struct boardtype boardtypes[] = {
@@ -151,7 +150,6 @@ static const struct boardtype boardtypes[] = {
                .has_diff_ai    = 1,
                .has_ao         = 1,
                .has_di_do      = 1,
-               .has_counter    = 1,
        },
        [BOARD_PCI1710HG] = {
                .name           = "pci1710hg",
@@ -162,7 +160,6 @@ static const struct boardtype boardtypes[] = {
                .has_diff_ai    = 1,
                .has_ao         = 1,
                .has_di_do      = 1,
-               .has_counter    = 1,
        },
        [BOARD_PCI1711] = {
                .name           = "pci1711",
@@ -171,7 +168,6 @@ static const struct boardtype boardtypes[] = {
                .rangecode_ai   = range_codes_pci17x1,
                .has_ao         = 1,
                .has_di_do      = 1,
-               .has_counter    = 1,
        },
        [BOARD_PCI1713] = {
                .name           = "pci1713",
@@ -791,7 +787,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
                n_subdevices++;
        if (board->has_di_do)
                n_subdevices += 2;
-       if (board->has_counter)
+       if (!board->is_pci1713) /* all other boards have a user counter */
                n_subdevices++;
 
        ret = comedi_alloc_subdevices(dev, n_subdevices);
@@ -866,8 +862,8 @@ static int pci1710_auto_attach(struct comedi_device *dev,
                subdev++;
        }
 
-       /* Counter subdevice (8254) */
-       if (board->has_counter) {
+       if (!board->is_pci1713) {
+               /* Counter subdevice (8254) */
                s = &dev->subdevices[subdev];
                comedi_8254_subdevice_init(s, dev->pacer);