lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: Remove me4000_board_t typedef

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton
2009-03-19 18:00:16 -04:00
committed by Greg Kroah-Hartman
parent 79dcd04224
commit 27f4caaa3b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/me4000.c
View File

@@ -92,7 +92,7 @@ static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {
MODULE_DEVICE_TABLE(pci, 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-4650", 0x4650, {0, 0}, {16, 0, 0, 0}, {4}, {0}},
{"ME-4660", 0x4660, {0, 0}, {32, 0, 16, 0}, {4}, {3}}, {"ME-4660", 0x4660, {0, 0}, {32, 0, 16, 0}, {4}, {3}},
@@ -113,7 +113,7 @@ static const me4000_board_t me4000_boards[] = {
{0}, {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 Comedi function prototypes
@@ -373,7 +373,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
struct pci_dev *pci_device; struct pci_dev *pci_device;
int result, i; int result, i;
me4000_board_t *board; struct me4000_board *board;
CALL_PDEBUG("In me4000_probe()\n"); 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; dev->board_ptr = me4000_boards + i;
board = (me4000_board_t *) dev-> board = (struct me4000_board *) dev->
board_ptr; board_ptr;
info->pci_dev_p = pci_device; info->pci_dev_p = pci_device;
goto found; goto found;

6
drivers/staging/comedi/drivers/me4000.h
View File

@@ -313,16 +313,16 @@ struct me4000_cnt_info {
int count; int count;
}; };
typedef struct me4000_board { struct me4000_board {
const char *name; const char *name;
unsigned short device_id; unsigned short device_id;
struct me4000_ao_info ao; struct me4000_ao_info ao;
struct me4000_ai_info ai; struct me4000_ai_info ai;
struct me4000_dio_info dio; struct me4000_dio_info dio;
struct me4000_cnt_info cnt; 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 Global board and subdevice information structures