diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-19 18:00:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:17 -0700 |
| commit | 27f4caaa3b27badb3e245a50b09ba35f040f3a77 (patch) | |
| tree | 3317b5159a2c2031761a052312613cb55dfb3795 | |
| parent | 79dcd042246ea49879bc9c15ed6592848f2f3828 (diff) | |
Staging: comedi: Remove me4000_board_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 8 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index d0a17a1adfc..31f35e0eceb 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -92,7 +92,7 @@ static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = { MODULE_DEVICE_TABLE(pci, me4000_pci_table); -static const me4000_board_t me4000_boards[] = { +static const struct me4000_board me4000_boards[] = { {"ME-4650", 0x4650, {0, 0}, {16, 0, 0, 0}, {4}, {0}}, {"ME-4660", 0x4660, {0, 0}, {32, 0, 16, 0}, {4}, {3}}, @@ -113,7 +113,7 @@ static const me4000_board_t me4000_boards[] = { {0}, }; -#define ME4000_BOARD_VERSIONS (sizeof(me4000_boards) / sizeof(me4000_board_t) - 1) +#define ME4000_BOARD_VERSIONS (sizeof(me4000_boards) / sizeof(struct me4000_board) - 1) /*----------------------------------------------------------------------------- Comedi function prototypes @@ -373,7 +373,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) { struct pci_dev *pci_device; int result, i; - me4000_board_t *board; + struct me4000_board *board; CALL_PDEBUG("In me4000_probe()\n"); @@ -405,7 +405,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) } } dev->board_ptr = me4000_boards + i; - board = (me4000_board_t *) dev-> + board = (struct me4000_board *) dev-> board_ptr; info->pci_dev_p = pci_device; goto found; diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h index d1c36e2f97b..27c48ff2b21 100644 --- a/drivers/staging/comedi/drivers/me4000.h +++ b/drivers/staging/comedi/drivers/me4000.h @@ -313,16 +313,16 @@ struct me4000_cnt_info { int count; }; -typedef struct me4000_board { +struct me4000_board { const char *name; unsigned short device_id; struct me4000_ao_info ao; struct me4000_ai_info ai; struct me4000_dio_info dio; struct me4000_cnt_info cnt; -} me4000_board_t; +}; -#define thisboard ((const me4000_board_t *)dev->board_ptr) +#define thisboard ((const struct me4000_board *)dev->board_ptr) /*============================================================================= Global board and subdevice information structures |