diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 22:07:22 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-08-19 14:53:08 -0400 |
| commit | 31f754628cbb12c983600f22d9f0fed50dfe2134 (patch) | |
| tree | 19bd679ef67164098b937b9a0ef5b66c4310598b /include/linux/mtd | |
| parent | 1001ff7a4f64f3f4264e69d3ed70ff428f627e01 (diff) | |
mtd: use __packed shorthand
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/cfi.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 37ef6b194089..299d7d31fe53 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h | |||
| @@ -153,7 +153,7 @@ struct cfi_ident { | |||
| 153 | uint16_t MaxBufWriteSize; | 153 | uint16_t MaxBufWriteSize; |
| 154 | uint8_t NumEraseRegions; | 154 | uint8_t NumEraseRegions; |
| 155 | uint32_t EraseRegionInfo[0]; /* Not host ordered */ | 155 | uint32_t EraseRegionInfo[0]; /* Not host ordered */ |
| 156 | } __attribute__((packed)); | 156 | } __packed; |
| 157 | 157 | ||
| 158 | /* Extended Query Structure for both PRI and ALT */ | 158 | /* Extended Query Structure for both PRI and ALT */ |
| 159 | 159 | ||
| @@ -161,7 +161,7 @@ struct cfi_extquery { | |||
| 161 | uint8_t pri[3]; | 161 | uint8_t pri[3]; |
| 162 | uint8_t MajorVersion; | 162 | uint8_t MajorVersion; |
| 163 | uint8_t MinorVersion; | 163 | uint8_t MinorVersion; |
| 164 | } __attribute__((packed)); | 164 | } __packed; |
| 165 | 165 | ||
| 166 | /* Vendor-Specific PRI for Intel/Sharp Extended Command Set (0x0001) */ | 166 | /* Vendor-Specific PRI for Intel/Sharp Extended Command Set (0x0001) */ |
| 167 | 167 | ||
| @@ -180,7 +180,7 @@ struct cfi_pri_intelext { | |||
| 180 | uint8_t FactProtRegSize; | 180 | uint8_t FactProtRegSize; |
| 181 | uint8_t UserProtRegSize; | 181 | uint8_t UserProtRegSize; |
| 182 | uint8_t extra[0]; | 182 | uint8_t extra[0]; |
| 183 | } __attribute__((packed)); | 183 | } __packed; |
| 184 | 184 | ||
| 185 | struct cfi_intelext_otpinfo { | 185 | struct cfi_intelext_otpinfo { |
| 186 | uint32_t ProtRegAddr; | 186 | uint32_t ProtRegAddr; |
| @@ -188,7 +188,7 @@ struct cfi_intelext_otpinfo { | |||
| 188 | uint8_t FactProtRegSize; | 188 | uint8_t FactProtRegSize; |
| 189 | uint16_t UserGroups; | 189 | uint16_t UserGroups; |
| 190 | uint8_t UserProtRegSize; | 190 | uint8_t UserProtRegSize; |
| 191 | } __attribute__((packed)); | 191 | } __packed; |
| 192 | 192 | ||
| 193 | struct cfi_intelext_blockinfo { | 193 | struct cfi_intelext_blockinfo { |
| 194 | uint16_t NumIdentBlocks; | 194 | uint16_t NumIdentBlocks; |
| @@ -196,7 +196,7 @@ struct cfi_intelext_blockinfo { | |||
| 196 | uint16_t MinBlockEraseCycles; | 196 | uint16_t MinBlockEraseCycles; |
| 197 | uint8_t BitsPerCell; | 197 | uint8_t BitsPerCell; |
| 198 | uint8_t BlockCap; | 198 | uint8_t BlockCap; |
| 199 | } __attribute__((packed)); | 199 | } __packed; |
| 200 | 200 | ||
| 201 | struct cfi_intelext_regioninfo { | 201 | struct cfi_intelext_regioninfo { |
| 202 | uint16_t NumIdentPartitions; | 202 | uint16_t NumIdentPartitions; |
| @@ -205,7 +205,7 @@ struct cfi_intelext_regioninfo { | |||
| 205 | uint8_t NumOpAllowedSimEraMode; | 205 | uint8_t NumOpAllowedSimEraMode; |
| 206 | uint8_t NumBlockTypes; | 206 | uint8_t NumBlockTypes; |
| 207 | struct cfi_intelext_blockinfo BlockTypes[1]; | 207 | struct cfi_intelext_blockinfo BlockTypes[1]; |
| 208 | } __attribute__((packed)); | 208 | } __packed; |
| 209 | 209 | ||
| 210 | struct cfi_intelext_programming_regioninfo { | 210 | struct cfi_intelext_programming_regioninfo { |
| 211 | uint8_t ProgRegShift; | 211 | uint8_t ProgRegShift; |
| @@ -214,7 +214,7 @@ struct cfi_intelext_programming_regioninfo { | |||
| 214 | uint8_t Reserved2; | 214 | uint8_t Reserved2; |
| 215 | uint8_t ControlInvalid; | 215 | uint8_t ControlInvalid; |
| 216 | uint8_t Reserved3; | 216 | uint8_t Reserved3; |
| 217 | } __attribute__((packed)); | 217 | } __packed; |
| 218 | 218 | ||
| 219 | /* Vendor-Specific PRI for AMD/Fujitsu Extended Command Set (0x0002) */ | 219 | /* Vendor-Specific PRI for AMD/Fujitsu Extended Command Set (0x0002) */ |
| 220 | 220 | ||
| @@ -233,7 +233,7 @@ struct cfi_pri_amdstd { | |||
| 233 | uint8_t VppMin; | 233 | uint8_t VppMin; |
| 234 | uint8_t VppMax; | 234 | uint8_t VppMax; |
| 235 | uint8_t TopBottom; | 235 | uint8_t TopBottom; |
| 236 | } __attribute__((packed)); | 236 | } __packed; |
| 237 | 237 | ||
| 238 | /* Vendor-Specific PRI for Atmel chips (command set 0x0002) */ | 238 | /* Vendor-Specific PRI for Atmel chips (command set 0x0002) */ |
| 239 | 239 | ||
| @@ -245,18 +245,18 @@ struct cfi_pri_atmel { | |||
| 245 | uint8_t BottomBoot; | 245 | uint8_t BottomBoot; |
| 246 | uint8_t BurstMode; | 246 | uint8_t BurstMode; |
| 247 | uint8_t PageMode; | 247 | uint8_t PageMode; |
| 248 | } __attribute__((packed)); | 248 | } __packed; |
| 249 | 249 | ||
| 250 | struct cfi_pri_query { | 250 | struct cfi_pri_query { |
| 251 | uint8_t NumFields; | 251 | uint8_t NumFields; |
| 252 | uint32_t ProtField[1]; /* Not host ordered */ | 252 | uint32_t ProtField[1]; /* Not host ordered */ |
| 253 | } __attribute__((packed)); | 253 | } __packed; |
| 254 | 254 | ||
| 255 | struct cfi_bri_query { | 255 | struct cfi_bri_query { |
| 256 | uint8_t PageModeReadCap; | 256 | uint8_t PageModeReadCap; |
| 257 | uint8_t NumFields; | 257 | uint8_t NumFields; |
| 258 | uint32_t ConfField[1]; /* Not host ordered */ | 258 | uint32_t ConfField[1]; /* Not host ordered */ |
| 259 | } __attribute__((packed)); | 259 | } __packed; |
| 260 | 260 | ||
| 261 | #define P_ID_NONE 0x0000 | 261 | #define P_ID_NONE 0x0000 |
| 262 | #define P_ID_INTEL_EXT 0x0001 | 262 | #define P_ID_INTEL_EXT 0x0001 |
