From 7633867387e68fe9668dd132b173fdcb69e00cc8 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:13 -0400 Subject: [PATCH] --- yaml --- r: 141608 b: refs/heads/master c: 52b3e3483d12f03ad6c1fa051a5db0b5656596c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/gsc_hpdi.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 360f1c0ea355..8d5bdc129e63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa11f7a978b9b93f46408ead81dba035828c1ff9 +refs/heads/master: 52b3e3483d12f03ad6c1fa051a5db0b5656596c9 diff --git a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c index 535aadb98dcc..001284f1583d 100644 --- a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c @@ -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, @@ -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) = { @@ -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 {