Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141565
b: refs/heads/master
c: c98d3de
h: refs/heads/master
i:
  141563: ede6962
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent d919c78 commit e832399
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc7bb61e00a2e9e4e0d742b9917cb37406080922
refs/heads/master: c98d3debeb1101858f7bd720116d00e15ae9124d
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/cb_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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 -----------------------------------*/
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e832399

Please sign in to comment.