From 5c2670cba2a5fd1a27f938ae11b3a24518d999db Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:10:44 -0400 Subject: [PATCH] Staging: comedi: Remove cb_pcidas_board typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/cb_pcidas.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index b0366e81445c..2d73f64002b1 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -241,7 +241,7 @@ enum trimpot_model { AD8402, }; -typedef struct cb_pcidas_board_struct { +struct cb_pcidas_board { const char *name; unsigned short device_id; int ai_se_chans; // Inputs in single-ended mode @@ -255,9 +255,9 @@ typedef struct cb_pcidas_board_struct { const struct comedi_lrange *ranges; enum trimpot_model trimpot; unsigned has_dac08:1; -} cb_pcidas_board; +}; -static const cb_pcidas_board cb_pcidas_boards[] = { +static const struct cb_pcidas_board cb_pcidas_boards[] = { { name: "pci-das1602/16", device_id:0x1, @@ -375,7 +375,7 @@ static const cb_pcidas_board cb_pcidas_boards[] = { }; // Number of boards in cb_pcidas_boards -#define N_BOARDS (sizeof(cb_pcidas_boards) / sizeof(cb_pcidas_board)) +#define N_BOARDS (sizeof(cb_pcidas_boards) / sizeof(struct cb_pcidas_board)) static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = { {PCI_VENDOR_ID_CB, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, @@ -394,7 +394,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidas_pci_table); /* * Useful for shorthand access to the particular board structure */ -#define thisboard ((const cb_pcidas_board *)dev->board_ptr) +#define thisboard ((const struct cb_pcidas_board *)dev->board_ptr) /* this structure is for data unique to this hardware driver. If several hardware drivers keep similar information in this structure, -- 2.20.1