From 52b3e3483d12f03ad6c1fa051a5db0b5656596c9 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:13 -0400 Subject: [PATCH] Staging: comedi: Remove hpdi_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/gsc_hpdi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 535aadb98dcc..001284f1583d 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/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 { -- 2.30.2