From 50bcf063f237feae0570b3ef1491fb5816abc12e Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:20:14 -0400 Subject: [PATCH] --- yaml --- r: 141651 b: refs/heads/master c: c0d1482252b9b87c62b8d0ddb7ceecc369c6e34e h: refs/heads/master i: 141649: e004bd6b2cd5e07cd51230680c8b88c8ffa16529 141647: 192471163ea9a0f005cbae5c34e8c27044fff751 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ssv_dnp.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e09d8e3cca21..ef73d992f5bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1dd2fa6a12bfba92d3522fa43173480f52dbaed +refs/heads/master: c0d1482252b9b87c62b8d0ddb7ceecc369c6e34e diff --git a/trunk/drivers/staging/comedi/drivers/ssv_dnp.c b/trunk/drivers/staging/comedi/drivers/ssv_dnp.c index 098b7b098828..1628d216cdd4 100644 --- a/trunk/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/trunk/drivers/staging/comedi/drivers/ssv_dnp.c @@ -52,14 +52,14 @@ Status: unknown /* This data structure holds information about the supported boards -------- */ -typedef struct dnp_board_struct { +struct dnp_board { const char *name; int ai_chans; int ai_bits; int have_dio; -} dnp_board; +}; -static const dnp_board dnp_boards[] = { /* we only support one DNP 'board' */ +static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */ { /* variant at the moment */ name: "dnp-1486", ai_chans:16, @@ -69,7 +69,7 @@ static const dnp_board dnp_boards[] = { /* we only support one DNP 'board' */ }; /* Useful for shorthand access to the particular board structure ----------- */ -#define thisboard ((const dnp_board *)dev->board_ptr) +#define thisboard ((const struct dnp_board *)dev->board_ptr) /* This structure is for data unique to the DNP driver --------------------- */ struct dnp_private_data { @@ -99,8 +99,8 @@ static struct comedi_driver driver_dnp = { detach:dnp_detach, board_name:&dnp_boards[0].name, /* only necessary for non-PnP devs */ - offset:sizeof(dnp_board),/* like ISA-PnP, PCI or PCMCIA. */ - num_names:sizeof(dnp_boards) / sizeof(dnp_board), + offset:sizeof(struct dnp_board),/* like ISA-PnP, PCI or PCMCIA. */ + num_names:sizeof(dnp_boards) / sizeof(struct dnp_board), }; COMEDI_INITCLEANUP(driver_dnp);