Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141608
b: refs/heads/master
c: 52b3e34
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent fe4a44c commit 7633867
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 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: fa11f7a978b9b93f46408ead81dba035828c1ff9
refs/heads/master: 52b3e3483d12f03ad6c1fa051a5db0b5656596c9
14 changes: 8 additions & 6 deletions trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,15 @@ uint32_t intr_active_high_bit(int interrupt_source)
return 0x1 << interrupt_source;
}

typedef struct {
struct hpdi_board {

char *name;
int device_id; // pci device id
int subdevice_id; // pci subdevice id
} hpdi_board;
};


static const hpdi_board hpdi_boards[] = {
static const struct hpdi_board hpdi_boards[] = {
{
name: "pci-hpdi32",
device_id:PCI_DEVICE_ID_PLX_9080,
Expand All @@ -283,7 +285,7 @@ static const hpdi_board hpdi_boards[] = {

static inline unsigned int num_boards(void)
{
return sizeof(hpdi_boards) / sizeof(hpdi_board);
return sizeof(hpdi_boards) / sizeof(struct hpdi_board);
}

static DEFINE_PCI_DEVICE_TABLE(hpdi_pci_table) = {
Expand All @@ -294,9 +296,9 @@ static DEFINE_PCI_DEVICE_TABLE(hpdi_pci_table) = {

MODULE_DEVICE_TABLE(pci, hpdi_pci_table);

static inline hpdi_board *board(const struct comedi_device * dev)
static inline struct hpdi_board *board(const struct comedi_device * dev)
{
return (hpdi_board *) dev->board_ptr;
return (struct hpdi_board *) dev->board_ptr;
}

typedef struct {
Expand Down

0 comments on commit 7633867

Please sign in to comment.