From c9942eb15bdd4a2034f18a54ee09d5b1b40b59f3 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 19 Mar 2009 17:59:28 -0400 Subject: [PATCH] --- yaml --- r: 141691 b: refs/heads/master c: 8c8a28852be4e876afdac208a41ab001dc817f99 h: refs/heads/master i: 141689: f02094e2b4a6f1db1525fe5fc92feb81b0137437 141687: c4e404ce50c1e8d6af21fdc65fdc0d77614a0d1a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_atmio16d.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bd3d921414eb..4158d36b46cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01983c39f023efa7204eb6b61480d5c495124240 +refs/heads/master: 8c8a28852be4e876afdac208a41ab001dc817f99 diff --git a/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c b/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c index 1e6eea5533c7..35fcd172af2e 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/trunk/drivers/staging/comedi/drivers/ni_atmio16d.c @@ -100,7 +100,7 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d) #define CLOCK_100_HZ 0x8F25 /* Other miscellaneous defines */ #define ATMIO16D_SIZE 32 /* bus address range */ -#define devpriv ((atmio16d_private *)dev->private) +#define devpriv ((struct atmio16d_private *)dev->private) #define ATMIO16D_TIMEOUT 10 struct atmio16_board_t { @@ -174,7 +174,7 @@ static const struct comedi_lrange range_atmio16d_ai_unipolar = { 4, { }; /* private data struct */ -typedef struct { +struct atmio16d_private { enum { adc_diff, adc_singleended } adc_mux; enum { adc_bipolar10, adc_bipolar5, adc_unipolar10 } adc_range; enum { adc_2comp, adc_straight } adc_coding; @@ -185,7 +185,7 @@ typedef struct { unsigned int ao_readback[2]; unsigned int com_reg_1_state; /* current state of command register 1 */ unsigned int com_reg_2_state; /* current state of command register 2 */ -} atmio16d_private; +}; static void reset_counters(struct comedi_device * dev) { @@ -728,7 +728,7 @@ static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * if ((ret = alloc_subdevices(dev, 4)) < 0) return ret; - if ((ret = alloc_private(dev, sizeof(atmio16d_private))) < 0) + if ((ret = alloc_private(dev, sizeof(struct atmio16d_private))) < 0) return ret; /* reset the atmio16d hardware */