aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/ni_65xx.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:15:51 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:09 -0700
commit125edf55eb4c722afa76b43da40f24a6fd2421ef (patch)
tree0fddf382d98aef7f9421e23e3d24258420c9dcdb /drivers/staging/comedi/drivers/ni_65xx.c
parent16d38ca3514bfcfad78f97dc136c955616303bf4 (diff)
downloadkernel_samsung_smdk4412-125edf55eb4c722afa76b43da40f24a6fd2421ef.zip
kernel_samsung_smdk4412-125edf55eb4c722afa76b43da40f24a6fd2421ef.tar.gz
kernel_samsung_smdk4412-125edf55eb4c722afa76b43da40f24a6fd2421ef.tar.bz2
Staging: comedi: Remove ni_65xx_board typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_65xx.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_65xx.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 59edcdf..c5fac96 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -111,15 +111,17 @@ static struct comedi_driver driver_ni_65xx = {
detach:ni_65xx_detach,
};
-typedef struct {
+struct ni_65xx_board {
+
int dev_id;
const char *name;
unsigned num_dio_ports;
unsigned num_di_ports;
unsigned num_do_ports;
unsigned invert_outputs:1;
-} ni_65xx_board;
-static const ni_65xx_board ni_65xx_boards[] = {
+};
+
+static const struct ni_65xx_board ni_65xx_boards[] = {
{
dev_id: 0x7085,
name: "pci-6509",
@@ -239,7 +241,7 @@ static const ni_65xx_board ni_65xx_boards[] = {
};
#define n_ni_65xx_boards (sizeof(ni_65xx_boards)/sizeof(ni_65xx_boards[0]))
-static inline const ni_65xx_board *board(struct comedi_device * dev)
+static inline const struct ni_65xx_board *board(struct comedi_device * dev)
{
return dev->board_ptr;
}
@@ -247,7 +249,7 @@ static inline unsigned ni_65xx_port_by_channel(unsigned channel)
{
return channel / ni_65xx_channels_per_port;
}
-static inline unsigned ni_65xx_total_num_ports(const ni_65xx_board * board)
+static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board * board)
{
return board->num_dio_ports + board->num_di_ports + board->num_do_ports;
}