From 32ffac27a9832bc79a92457d2aea8d7470b5980c Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:13:58 -0400 Subject: [PATCH] --- yaml --- r: 141595 b: refs/heads/master c: 0c5a144d730a68967dfb3f8163260a142e3282e3 h: refs/heads/master i: 141593: 1aa91d4e25920e9004141b654a0f7926d59e52ce 141591: 328bc95feedcfa8772074924f9e5032911f68cc9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das1800.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 90b12ccb820a..1186c74c24fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce422cf3569444116d7d826b274bd59cc34d3b28 +refs/heads/master: 0c5a144d730a68967dfb3f8163260a142e3282e3 diff --git a/trunk/drivers/staging/comedi/drivers/das1800.c b/trunk/drivers/staging/comedi/drivers/das1800.c index 950ee2c7cd57..cd4cd4e6a79b 100644 --- a/trunk/drivers/staging/comedi/drivers/das1800.c +++ b/trunk/drivers/staging/comedi/drivers/das1800.c @@ -463,7 +463,7 @@ static const struct das1800_board das1800_boards[] = { */ #define thisboard ((const struct das1800_board *)dev->board_ptr) -typedef struct { +struct das1800_private { volatile unsigned int count; /* number of data points left to be taken */ 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 */ @@ -481,9 +481,9 @@ typedef struct { unsigned int dma_transfer_size; /* size of transfer currently used, in bytes */ unsigned long iobase2; /* secondary io address used for analog out on 'ao' boards */ short ao_update_bits; /* remembers the last write to the 'update' dac */ -} das1800_private; +}; -#define devpriv ((das1800_private *)dev->private) +#define devpriv ((struct das1800_private *)dev->private) // analog out range for boards with basic analog out static const struct comedi_lrange range_ao_1 = { @@ -602,7 +602,7 @@ static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * int retval; /* allocate and initialize dev->private */ - if (alloc_private(dev, sizeof(das1800_private)) < 0) + if (alloc_private(dev, sizeof(struct das1800_private)) < 0) return -ENOMEM; printk("comedi%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,