diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:12:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:06 -0700 |
| commit | cdc14cd0ea064b4838f63073ebf5cd2fdf13f309 (patch) | |
| tree | 62bce19752c6ef83028581e9144bdc47e358b074 /drivers | |
| parent | 2deee55e66d0de60ca28703da5aba8bdaf27b4ba (diff) | |
Staging: comedi: Remove force_array_t typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index bb0e499d8b8..75867c95b49 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -644,7 +644,7 @@ static poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s) printk("state_jr3_init_set_full_scale_complete complete = %d\n", is_complete(channel)); result = poll_delay_min_max(20, 100); } else { - volatile force_array_t *full_scale; + volatile struct force_array *full_scale; // Use ranges in kN or we will overflow arount 2000N! full_scale = &channel->full_scale; diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index 43d1411417a..06c32f50719 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h @@ -50,7 +50,7 @@ struct raw_channel { /* The force_array structure shows the layout for the decoupled and * filtered force data. */ -typedef struct force_array { +struct force_array { s32 fx; s32 fy; s32 fz; @@ -59,7 +59,7 @@ typedef struct force_array { s32 mz; s32 v1; s32 v2; -} force_array_t; +}; /* The six_axis_array structure shows the layout for the offsets and * the full scales. @@ -375,7 +375,7 @@ typedef struct force_sensor_data { * axes used for each vector respectively. */ - force_array_t full_scale; /* offset 0x0080 */ + struct force_array full_scale; /* offset 0x0080 */ /* Offsets contains the sensor offsets. These values are subtracted from * the sensor data to obtain the decoupled data. The offsets are set a @@ -432,7 +432,7 @@ typedef struct force_sensor_data { * calculated is specified by the variable rate_address (pg. 12). */ - force_array_t rate_data; /* offset 0x00c8 */ + struct force_array rate_data; /* offset 0x00c8 */ /* Minimum_data & maximum_data are the minimum and maximum (peak) * data values. The JR3 DSP can monitor any 8 contiguous data items @@ -446,8 +446,8 @@ typedef struct force_sensor_data { * also lost when plugging in a new sensor. */ - force_array_t minimum_data; /* offset 0x00d0 */ - force_array_t maximum_data; /* offset 0x00d8 */ + struct force_array minimum_data; /* offset 0x00d0 */ + struct force_array maximum_data; /* offset 0x00d8 */ /* Near_sat_value & sat_value contain the value used to determine if * the raw sensor is saturated. Because of decoupling and offset |