Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8629efa4 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: make use of ARRAY_SIZE macro 



Replace instances of computing number of elements in an array with
sizeof(foo)/sizeof(struct footype) with the ARRAY_SIZE macro.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4918808

drivers/staging/comedi/drivers.c

+2 −1
Original line number Diff line number Diff line
@@ -853,7 +853,8 @@ int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name) 
	/*  pci slot */

	options[1] = PCI_SLOT(pcidev->devfn);



	return comedi_auto_config(&pcidev->dev, board_name, options, sizeof(options) / sizeof(options[0]));

	return comedi_auto_config(&pcidev->dev, board_name,

				  options, ARRAY_SIZE(options));

}



void comedi_pci_auto_unconfig(struct pci_dev *pcidev)

drivers/staging/comedi/drivers/adl_pci6208.c

+1 −4
Original line number Diff line number Diff line
@@ -110,9 +110,6 @@ struct pci6208_private { 
static int pci6208_attach(struct comedi_device *dev, struct comedi_devconfig *it);

static int pci6208_detach(struct comedi_device *dev);



#define pci6208_board_nbr \

	(sizeof(pci6208_boards) / sizeof(struct pci6208_board))



static struct comedi_driver driver_pci6208 = {

	.driver_name = PCI6208_DRIVER_NAME,

	.module = THIS_MODULE,
@@ -315,7 +312,7 @@ static int pci6208_find_device(struct comedi_device *dev, int bus, int slot) 
		pci_dev != NULL;

		pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {

		if (pci_dev->vendor == PCI_VENDOR_ID_ADLINK) {

			for (i = 0; i < pci6208_board_nbr; i++) {

			for (i = 0; i < ARRAY_SIZE(pci6208_boards); i++) {

				if (pci6208_boards[i].dev_id == pci_dev->device) {

					/*  was a particular bus/slot requested? */

					if ((bus != 0) || (slot != 0)) {

drivers/staging/comedi/drivers/adq12b.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct comedi_driver driver_adq12b={ 
        detach:         adq12b_detach,

        board_name:     &adq12b_boards[0].name,

        offset:         sizeof(struct adq12b_board),

        num_names:      sizeof(adq12b_boards) / sizeof(struct adq12b_board),

        num_names:      ARRAY_SIZE(adq12b_boards),

};



static int adq12b_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data);

drivers/staging/comedi/drivers/aio_iiro_16.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct comedi_driver driver_aio_iiro_16 = { 
	.detach = aio_iiro_16_detach,

	.board_name = &aio_iiro_16_boards[0].name,

	.offset = sizeof(struct aio_iiro_16_board),

	.num_names = sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board),

	.num_names = ARRAY_SIZE(aio_iiro_16_boards),

};



static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,

drivers/staging/comedi/drivers/amplc_dio200.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static struct comedi_driver driver_amplc_dio200 = { 
	.detach = dio200_detach,

	.board_name = &dio200_boards[0].name,

	.offset = sizeof(struct dio200_board),

	.num_names = sizeof(dio200_boards) / sizeof(struct dio200_board),

	.num_names = ARRAY_SIZE(dio200_boards),

};



#ifdef CONFIG_COMEDI_PCI