From fe1f4d578a35824ccfd9783473100dc0926e168d Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:17:33 -0400 Subject: [PATCH] --- yaml --- r: 141673 b: refs/heads/master c: 1de6a6fd5b672f3a2d8aa6ebe4c85552f091277b h: refs/heads/master i: 141671: c90b2070786e8b71d23c73984372f04f52f974bd v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 45f9d9bfe6f5..b83947105287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 180089a8966e712cb8cb9af1d7401c3e12453d74 +refs/heads/master: 1de6a6fd5b672f3a2d8aa6ebe4c85552f091277b diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index 594c5e82211f..334ac5773a13 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/drivers/staging/comedi/drivers/rti800.c @@ -118,16 +118,18 @@ static const struct comedi_lrange range_rti800_ai_unipolar = { 4, { } }; -typedef struct { +struct rti800_board { + const char *name; int has_ao; -} boardtype; -static const boardtype boardtypes[] = { +}; + +static const struct rti800_board boardtypes[] = { {"rti800", 0}, {"rti815", 1}, }; -#define this_board ((const boardtype *)dev->board_ptr) +#define this_board ((const struct rti800_board *)dev->board_ptr) static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int rti800_detach(struct comedi_device * dev); @@ -136,9 +138,9 @@ static struct comedi_driver driver_rti800 = { module:THIS_MODULE, attach:rti800_attach, detach:rti800_detach, - num_names:sizeof(boardtypes) / sizeof(boardtype), + num_names:sizeof(boardtypes) / sizeof(struct rti800_board), board_name:&boardtypes[0].name, - offset:sizeof(boardtype), + offset:sizeof(struct rti800_board), }; COMEDI_INITCLEANUP(driver_rti800);