Staging: comedi: Remove force_array_t typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index bb0e499d8b836f50df6c65158f660412857433e6..75867c95b49d6d801f910490cd47d3199bde06a8 100644 (file)
--- 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 43d1411417a4c8695b36c7d93fa4769aac30ca51..06c32f507197ebb06dffc79ba66c682b303f9650 100644 (file)
--- 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