From 03ca706cbe562cc2e0d6e65e52b31963bf38618f Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:51 -0400 Subject: [PATCH] --- yaml --- r: 141615 b: refs/heads/master c: 125edf55eb4c722afa76b43da40f24a6fd2421ef h: refs/heads/master i: 141613: c2a419997dab7842fd4fd040fb40cc45e14578e1 141611: 6b50c68cb447a1960c6a5b1bfd7fa422926e9c19 141607: fe4a44c6baf618b43b5f127306cb1050e986020c 141599: 4c0925b4284b41128ed0ba75369c9b07f60b22b8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_65xx.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 57b23d1f610e..4274423ba14e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16d38ca3514bfcfad78f97dc136c955616303bf4 +refs/heads/master: 125edf55eb4c722afa76b43da40f24a6fd2421ef diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c index 59edcdf8e032..c5fac96f25dd 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c +++ b/trunk/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; }