diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:20:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:12 -0700 |
| commit | 050509fa558306399f2a987956514a8f849846ef (patch) | |
| tree | aa2ee6d88ce4949ee3c0321118529c91b3443856 /drivers/staging/comedi | |
| parent | c611ad3313831f1f79b063b282deb4248e283f39 (diff) | |
Staging: comedi: Remove six_axis_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 8ff7b986235..a3c887f3b2c 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -224,17 +224,17 @@ static void set_offset(volatile struct jr3_channel *channel) set_s16(&channel->command_word0, 0x0700); } -typedef struct { +struct six_axis_t { s16 fx; s16 fy; s16 fz; s16 mx; s16 my; s16 mz; -} six_axis_t; +}; static void set_full_scales(volatile struct jr3_channel *channel, - six_axis_t full_scale) + struct six_axis_t full_scale) { printk("%d %d %d %d %d %d\n", full_scale.fx, @@ -249,9 +249,9 @@ static void set_full_scales(volatile struct jr3_channel *channel, set_s16(&channel->command_word0, 0x0a00); } -static six_axis_t get_min_full_scales(volatile struct jr3_channel *channel) +static struct six_axis_t get_min_full_scales(volatile struct jr3_channel *channel) { - six_axis_t result; + struct six_axis_t result; result.fx = get_s16(&channel->min_full_scale.fx); result.fy = get_s16(&channel->min_full_scale.fy); result.fz = get_s16(&channel->min_full_scale.fz); @@ -261,9 +261,9 @@ static six_axis_t get_min_full_scales(volatile struct jr3_channel *channel) return result; } -static six_axis_t get_max_full_scales(volatile struct jr3_channel *channel) +static struct six_axis_t get_max_full_scales(volatile struct jr3_channel *channel) { - six_axis_t result; + struct six_axis_t result; result.fx = get_s16(&channel->max_full_scale.fx); result.fy = get_s16(&channel->max_full_scale.fy); result.fz = get_s16(&channel->max_full_scale.fz); @@ -609,8 +609,8 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s) result = poll_delay_min_max(20, 100); } else { // Set full scale - six_axis_t min_full_scale; - six_axis_t max_full_scale; + struct six_axis_t min_full_scale; + struct six_axis_t max_full_scale; min_full_scale = get_min_full_scales(channel); |