OSDN Git Service

staging: comedi: jr3_pci: separate out block type
authorIan Abbott <abbotti@mev.co.uk>
Wed, 8 Mar 2017 18:44:27 +0000 (18:44 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 12 Mar 2017 13:57:00 +0000 (14:57 +0100)
`struct jr3_t` contains a single array member `block` of a tag-less
`struct` type.  Rename the tag-less `struct` type to `struct jr3_block`
and move its definition outside of `struct jr3_t`.  This will allow us
to use pointers of this type.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/jr3_pci.h

index ab40828..fca46ea 100644 (file)
@@ -724,13 +724,15 @@ struct jr3_sensor {
        struct intern_transform transforms[0x10];       /* offset 0x0200 */
 };
 
+struct jr3_block {
+       u32 program_lo[0x4000];         /*  0x00000 - 0x10000 */
+       struct jr3_sensor sensor;       /*  0x10000 - 0x10c00 */
+       char pad2[0x30000 - 0x00c00];   /*  0x10c00 - 0x40000 */
+       u32 program_hi[0x8000];         /*  0x40000 - 0x60000 */
+       u32 reset;                      /*  0x60000 - 0x60004 */
+       char pad3[0x20000 - 0x00004];   /*  0x60004 - 0x80000 */
+};
+
 struct jr3_t {
-       struct {
-               u32 program_lo[0x4000];         /*  0x00000 - 0x10000 */
-               struct jr3_sensor sensor;       /*  0x10000 - 0x10c00 */
-               char pad2[0x30000 - 0x00c00];   /*  0x10c00 - 0x40000 */
-               u32 program_hi[0x8000];         /*  0x40000 - 0x60000 */
-               u32 reset;                      /*  0x60000 - 0x60004 */
-               char pad3[0x20000 - 0x00004];   /*  0x60004 - 0x80000 */
-       } block[4];
+       struct jr3_block block[4];
 };