lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: Remove six_axis_t typedef

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton
2009-03-16 22:20:57 -04:00
committed by Greg Kroah-Hartman
parent c611ad3313
commit 050509fa55
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/jr3_pci.c
View File

@@ -224,17 +224,17 @@ static void set_offset(volatile struct jr3_channel *channel)
set_s16(&channel->command_word0, 0x0700); set_s16(&channel->command_word0, 0x0700);
} }
typedef struct { struct six_axis_t {
s16 fx; s16 fx;
s16 fy; s16 fy;
s16 fz; s16 fz;
s16 mx; s16 mx;
s16 my; s16 my;
s16 mz; s16 mz;
} six_axis_t; };
static void set_full_scales(volatile struct jr3_channel *channel, 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", printk("%d %d %d %d %d %d\n",
full_scale.fx, full_scale.fx,
@@ -249,9 +249,9 @@ static void set_full_scales(volatile struct jr3_channel *channel,
set_s16(&channel->command_word0, 0x0a00); 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.fx = get_s16(&channel->min_full_scale.fx);
result.fy = get_s16(&channel->min_full_scale.fy); result.fy = get_s16(&channel->min_full_scale.fy);
result.fz = get_s16(&channel->min_full_scale.fz); 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; 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.fx = get_s16(&channel->max_full_scale.fx);
result.fy = get_s16(&channel->max_full_scale.fy); result.fy = get_s16(&channel->max_full_scale.fy);
result.fz = get_s16(&channel->max_full_scale.fz); 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); result = poll_delay_min_max(20, 100);
} else { } else {
// Set full scale // Set full scale
six_axis_t min_full_scale; struct six_axis_t min_full_scale;
six_axis_t max_full_scale; struct six_axis_t max_full_scale;
min_full_scale = min_full_scale =
get_min_full_scales(channel); get_min_full_scales(channel);