From: Chen Gang <gang.chen.5...@gmail.com>

Use tab instead of 4 white spaces for indent, and remove redundant empty
line.

Put constant macro definition before structure definition, so that the
structure definition can use the constant macro, e.g. ADFS_DR_SIZE.

And still left hardcode number "52" for unused52, since the name already
contents "52". If it was "unused", not "unused52", we could use struct
including union including struct to remove hardcode number "52".

Signed-off-by: Chen Gang <gang.chen.5...@gmail.com>
---
 include/uapi/linux/adfs_fs.h | 61 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/include/uapi/linux/adfs_fs.h b/include/uapi/linux/adfs_fs.h
index a1bf437..0c9bc36 100644
--- a/include/uapi/linux/adfs_fs.h
+++ b/include/uapi/linux/adfs_fs.h
@@ -4,41 +4,40 @@
 #include <linux/types.h>
 #include <linux/magic.h>
 
-/*
- * Disc Record at disc address 0xc00
- */
-struct adfs_discrecord {
-    __u8  log2secsize;
-    __u8  secspertrack;
-    __u8  heads;
-    __u8  density;
-    __u8  idlen;
-    __u8  log2bpmb;
-    __u8  skew;
-    __u8  bootoption;
-    __u8  lowsector;
-    __u8  nzones;
-    __le16 zone_spare;
-    __le32 root;
-    __le32 disc_size;
-    __le16 disc_id;
-    __u8  disc_name[10];
-    __le32 disc_type;
-    __le32 disc_size_high;
-    __u8  log2sharesize:4;
-    __u8  unused40:4;
-    __u8  big_flag:1;
-    __u8  unused41:1;
-    __u8  nzones_high;
-    __le32 format_version;
-    __le32 root_size;
-    __u8  unused52[60 - 52];
-};
-
 #define ADFS_DISCRECORD                (0xc00)
 #define ADFS_DR_OFFSET         (0x1c0)
 #define ADFS_DR_SIZE            60
 #define ADFS_DR_SIZE_BITS      (ADFS_DR_SIZE << 3)
 
+/*
+ * Disc Record at disc address 0xc00
+ */
+struct adfs_discrecord {
+       __u8  log2secsize;
+       __u8  secspertrack;
+       __u8  heads;
+       __u8  density;
+       __u8  idlen;
+       __u8  log2bpmb;
+       __u8  skew;
+       __u8  bootoption;
+       __u8  lowsector;
+       __u8  nzones;
+       __le16 zone_spare;
+       __le32 root;
+       __le32 disc_size;
+       __le16 disc_id;
+       __u8  disc_name[10];
+       __le32 disc_type;
+       __le32 disc_size_high;
+       __u8  log2sharesize:4;
+       __u8  unused40:4;
+       __u8  big_flag:1;
+       __u8  unused41:1;
+       __u8  nzones_high;
+       __le32 format_version;
+       __le32 root_size;
+       __u8  unused52[ADFS_DR_SIZE - 52];
+};
 
 #endif /* _UAPI_ADFS_FS_H */
-- 
1.9.3

Reply via email to