From 355f644f418710dd34e0c7fb50df69c51c547ba1 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 19 Mar 2009 17:59:23 -0400 Subject: [PATCH] --- yaml --- r: 141690 b: refs/heads/master c: 01983c39f023efa7204eb6b61480d5c495124240 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_at_ao.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 142b2c475a2d..bd3d921414eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92b635c5bea18d7eb3c46bfdcc930d9d86d3d177 +refs/heads/master: 01983c39f023efa7204eb6b61480d5c495124240 diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c index efacfda03b2f..2cc46b672588 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c @@ -151,11 +151,12 @@ Configuration options: * boards in this way is optional, and completely driver-dependent. * Some drivers use arrays such as this, other do not. */ -typedef struct atao_board_struct { +struct atao_board { const char *name; int n_ao_chans; -} atao_board; -static const atao_board atao_boards[] = { +}; + +static const struct atao_board atao_boards[] = { { name: "ai-ao-6", n_ao_chans:6, @@ -166,7 +167,7 @@ static const atao_board atao_boards[] = { }, }; -#define thisboard ((atao_board *)dev->board_ptr) +#define thisboard ((struct atao_board *)dev->board_ptr) struct atao_private { @@ -188,8 +189,8 @@ static struct comedi_driver driver_atao = { attach:atao_attach, detach:atao_detach, board_name:&atao_boards[0].name, - offset:sizeof(atao_board), - num_names:sizeof(atao_boards) / sizeof(atao_board), + offset:sizeof(struct atao_board), + num_names:sizeof(atao_boards) / sizeof(struct atao_board), }; COMEDI_INITCLEANUP(driver_atao);