From wfp5p@virginia.edu Thu Mar 19 13:06:15 2009 From: Bill Pemberton Date: Thu, 19 Mar 2009 17:59:34 -0400 Subject: Staging: comedi: Remove dio700_board typedef To: greg@kroah.com Cc: abbotti@mev.co.uk, fmhess@users.sourceforge.net, ds@schleef.org Message-ID: <20090319215933.10220.21130.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_daq_700.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -60,7 +60,7 @@ static int dio700_detach(struct comedi_d enum dio700_bustype { pcmcia_bustype }; -typedef struct dio700_board_struct { +struct dio700_board { const char *name; int device_id; // device id for pcmcia board enum dio700_bustype bustype; // PCMCIA @@ -69,9 +69,9 @@ typedef struct dio700_board_struct { // as appropriate unsigned int (*read_byte) (unsigned int address); void (*write_byte) (unsigned int byte, unsigned int address); -} dio700_board; +}; -static const dio700_board dio700_boards[] = { +static const struct dio700_board dio700_boards[] = { { name: "daqcard-700", device_id:0x4743,// 0x10b is manufacturer id, 0x4743 is device id @@ -89,7 +89,7 @@ static const dio700_board dio700_boards[ /* * Useful for shorthand access to the particular board structure */ -#define thisboard ((const dio700_board *)dev->board_ptr) +#define thisboard ((const struct dio700_board *)dev->board_ptr) struct dio700_private { @@ -104,9 +104,9 @@ static struct comedi_driver driver_dio70 module:THIS_MODULE, attach:dio700_attach, detach:dio700_detach, - num_names:sizeof(dio700_boards) / sizeof(dio700_board), + num_names:sizeof(dio700_boards) / sizeof(struct dio700_board), board_name:&dio700_boards[0].name, - offset:sizeof(dio700_board), + offset:sizeof(struct dio700_board), }; /* the real driver routines */