From 617ee73e9b353204cf19a0b1484097d682ac617a Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:13:47 -0400 Subject: [PATCH] --- yaml --- r: 141664 b: refs/heads/master c: 938f185d4eea489ad802554e2faef9c99e377aa5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das800.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 539b52a1c35a..24c01db912e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b90c76fd78a101835eb1cc17271d008ed51688d3 +refs/heads/master: 938f185d4eea489ad802554e2faef9c99e377aa5 diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c index 71586cccdaca..7a6656bf809c 100644 --- a/trunk/drivers/staging/comedi/drivers/das800.c +++ b/trunk/drivers/staging/comedi/drivers/das800.c @@ -232,15 +232,15 @@ static const struct das800_board das800_boards[] = { */ #define thisboard ((const struct das800_board *)dev->board_ptr) -typedef struct { +struct das800_private { volatile unsigned int count; /* number of data points left to be taken */ volatile int forever; /* flag indicating whether we should take data forever */ unsigned int divisor1; /* value to load into board's counter 1 for timed conversions */ unsigned int divisor2; /* value to load into board's counter 2 for timed conversions */ volatile int do_bits; /* digital output bits */ -} das800_private; +}; -#define devpriv ((das800_private *)dev->private) +#define devpriv ((struct das800_private *)dev->private) static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int das800_detach(struct comedi_device * dev); @@ -456,7 +456,7 @@ static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * i printk("\n"); /* allocate and initialize dev->private */ - if (alloc_private(dev, sizeof(das800_private)) < 0) + if (alloc_private(dev, sizeof(struct das800_private)) < 0) return -ENOMEM; if (iobase == 0) {