Staging: comedi: Remove six_axis_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 8ff7b986235b8276e319b66264632d0093b0777e..a3c887f3b2c6afc09dff76dceee549a5844c1e06 100644 (file)
--- 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);