aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-19 17:59:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:17 -0400
commit8c8a28852be4e876afdac208a41ab001dc817f99 (patch)
tree66f859265ac6901e24002510c6ee6d9565ed7571
parent01983c39f023efa7204eb6b61480d5c495124240 (diff)
Staging: comedi: Remove atmio16d_private typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/ni_atmio16d.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c
index 1e6eea5533c7..35fcd172af2e 100644
--- a/drivers/staging/comedi/drivers/ni_atmio16d.c
+++ b/drivers/staging/comedi/drivers/ni_atmio16d.c
@@ -100,7 +100,7 @@ Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
100#define CLOCK_100_HZ 0x8F25 100#define CLOCK_100_HZ 0x8F25
101/* Other miscellaneous defines */ 101/* Other miscellaneous defines */
102#define ATMIO16D_SIZE 32 /* bus address range */ 102#define ATMIO16D_SIZE 32 /* bus address range */
103#define devpriv ((atmio16d_private *)dev->private) 103#define devpriv ((struct atmio16d_private *)dev->private)
104#define ATMIO16D_TIMEOUT 10 104#define ATMIO16D_TIMEOUT 10
105 105
106struct atmio16_board_t { 106struct atmio16_board_t {
@@ -174,7 +174,7 @@ static const struct comedi_lrange range_atmio16d_ai_unipolar = { 4, {
174}; 174};
175 175
176/* private data struct */ 176/* private data struct */
177typedef struct { 177struct atmio16d_private {
178 enum { adc_diff, adc_singleended } adc_mux; 178 enum { adc_diff, adc_singleended } adc_mux;
179 enum { adc_bipolar10, adc_bipolar5, adc_unipolar10 } adc_range; 179 enum { adc_bipolar10, adc_bipolar5, adc_unipolar10 } adc_range;
180 enum { adc_2comp, adc_straight } adc_coding; 180 enum { adc_2comp, adc_straight } adc_coding;
@@ -185,7 +185,7 @@ typedef struct {
185 unsigned int ao_readback[2]; 185 unsigned int ao_readback[2];
186 unsigned int com_reg_1_state; /* current state of command register 1 */ 186 unsigned int com_reg_1_state; /* current state of command register 1 */
187 unsigned int com_reg_2_state; /* current state of command register 2 */ 187 unsigned int com_reg_2_state; /* current state of command register 2 */
188} atmio16d_private; 188};
189 189
190static void reset_counters(struct comedi_device * dev) 190static void reset_counters(struct comedi_device * dev)
191{ 191{
@@ -728,7 +728,7 @@ static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig *
728 728
729 if ((ret = alloc_subdevices(dev, 4)) < 0) 729 if ((ret = alloc_subdevices(dev, 4)) < 0)
730 return ret; 730 return ret;
731 if ((ret = alloc_private(dev, sizeof(atmio16d_private))) < 0) 731 if ((ret = alloc_private(dev, sizeof(struct atmio16d_private))) < 0)
732 return ret; 732 return ret;
733 733
734 /* reset the atmio16d hardware */ 734 /* reset the atmio16d hardware */