From 4e861f0fd828d2c058271ace21963fa2ef7e861d Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 8 Mar 2017 18:44:27 +0000 Subject: staging: comedi: jr3_pci: separate out block type `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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/jr3_pci.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'drivers/staging/comedi') diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index ab40828df6ea..fca46eaf6f7f 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h @@ -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]; }; -- cgit v1.2.3