From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 11 Sep 2012 01:50:49 +0000 (-0700)
Subject: staging: comedi: adl_pci9111: remove pci9111_board_nbr macro
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3faac285bbe190667798bc6aa20c51c91c6a165e;p=deliverable%2Flinux.git

staging: comedi: adl_pci9111: remove pci9111_board_nbr macro

This macro is an open-coded version of the kernels ARRAY_SIZE
macro. Use the kernel provided macro instead.

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/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index cf3c43a04555..01a861d8d202 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -332,9 +332,6 @@ static const struct pci9111_board pci9111_boards[] = {
 	 .ai_acquisition_period_min_ns = PCI9111_AI_ACQUISITION_PERIOD_MIN_NS}
 };
 
-#define pci9111_board_nbr \
-	(sizeof(pci9111_boards)/sizeof(struct pci9111_board))
-
 /*  Private data structure */
 
 struct pci9111_private_data {
@@ -1228,7 +1225,7 @@ static struct pci_dev *pci9111_find_pci(struct comedi_device *dev,
 	for_each_pci_dev(pcidev) {
 		if (pcidev->vendor != PCI_VENDOR_ID_ADLINK)
 			continue;
-		for (i = 0; i < pci9111_board_nbr; i++) {
+		for (i = 0; i < ARRAY_SIZE(pci9111_boards); i++) {
 			if (pcidev->device != pci9111_boards[i].device_id)
 				continue;
 			if (bus || slot) {