diff --git a/[refs] b/[refs] index b1cae9abc53d..8eb778845fb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98943079bfe0fcaca05410ea2fcfc00988ecc661 +refs/heads/master: 3faac285bbe190667798bc6aa20c51c91c6a165e diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index cf3c43a04555..01a861d8d202 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/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) {