From e832399cbcd6e354c009462634d863087b99a868 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:11:06 -0400 Subject: [PATCH] --- yaml --- r: 141565 b: refs/heads/master c: c98d3debeb1101858f7bd720116d00e15ae9124d h: refs/heads/master i: 141563: ede696210de8c86730ff9446b436bbf74d6f8acb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcidio.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 31927a8ef16d..1c521ec3b6d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc7bb61e00a2e9e4e0d742b9917cb37406080922 +refs/heads/master: c98d3debeb1101858f7bd720116d00e15ae9124d diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidio.c b/trunk/drivers/staging/comedi/drivers/cb_pcidio.c index a34dc9543f9d..06e1306dd5fd 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcidio.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcidio.c @@ -52,16 +52,16 @@ Passing a zero for an option is the same as leaving it unspecified. * boards in this way is optional, and completely driver-dependent. * Some drivers use arrays such as this, other do not. */ -typedef struct pcidio_board_struct { +struct pcidio_board { const char *name; // anme of the board int n_8255; // number of 8255 chips on board // indices of base address regions int pcicontroler_badrindex; int dioregs_badrindex; -} pcidio_board; +}; -static const pcidio_board pcidio_boards[] = { +static const struct pcidio_board pcidio_boards[] = { { name: "pci-dio24", n_8255: 1, @@ -98,7 +98,7 @@ MODULE_DEVICE_TABLE(pci, pcidio_pci_table); /* * Useful for shorthand access to the particular board structure */ -#define thisboard ((const pcidio_board *)dev->board_ptr) +#define thisboard ((const struct pcidio_board *)dev->board_ptr) /* this structure is for data unique to this hardware driver. If several hardware drivers keep similar information in this structure, @@ -154,8 +154,8 @@ static struct comedi_driver driver_cb_pcidio = { */ // The following fields should NOT be initialized if you are dealing with PCI devices // board_name: pcidio_boards, -// offset: sizeof(pcidio_board), -// num_names: sizeof(pcidio_boards) / sizeof(pcidio_board), +// offset: sizeof(struct pcidio_board), +// num_names: sizeof(pcidio_boards) / sizeof(struct pcidio_board), }; /*------------------------------- FUNCTIONS -----------------------------------*/ @@ -197,7 +197,7 @@ static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * i continue; // loop through cards supported by this driver for (index = 0; - index < sizeof pcidio_boards / sizeof(pcidio_board); + index < sizeof pcidio_boards / sizeof(struct pcidio_board); index++) { if (pcidio_pci_table[index].device != pcidev->device) continue;