staging: comedi: me4000: remove ME4000_BOARD_VERSIONS

Remove the terminating entry in the boardinfo so that ARRAY_SIZE
works correctly. Then remove ME4000_BOARD_VERSIONS and just use
ARRAY_SIZE in the probe.

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>

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 050f0e41608909d68f52c378c22724cbc9b3ed5c..028c20f6dcc06e7706b775cb8588afe8802b6463 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -81,12 +81,8 @@ static const struct me4000_board me4000_boards[] = {
        {"ME-4680i", 0x4681, {4, 4}, {32, 0, 16, 1}, {4}, {3} },
        {"ME-4680s", 0x4682, {4, 4}, {32, 8, 16, 1}, {4}, {3} },
        {"ME-4680is", 0x4683, {4, 4}, {32, 8, 16, 1}, {4}, {3} },
-
-       {0},
 };
 
-#define ME4000_BOARD_VERSIONS (ARRAY_SIZE(me4000_boards) - 1)
-
 /*-----------------------------------------------------------------------------
   Meilhaus function prototypes
   ---------------------------------------------------------------------------*/
@@ -136,7 +132,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
         */
        for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_MEILHAUS) {
-                       for (i = 0; i < ME4000_BOARD_VERSIONS; i++) {
+                       for (i = 0; i < ARRAY_SIZE(me4000_boards); i++) {
                                if (me4000_boards[i].device_id ==
                                    pci_device->device) {
                                        /*