diff options
author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2013-10-24 11:40:37 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-11-08 17:43:12 -0500 |
commit | 78a5886472085a6e458824858a8c8338113aec4e (patch) | |
tree | 28022e2854e96e70e3c0a3e808f4f12f18ea5b03 /drivers/infiniband | |
parent | 603e7729920e42b3c2f4dbfab9eef4878cb6e8fa (diff) |
IB/qib: Fix checkpatch __packed warnings
Convert __attribute__ ((packed)) to __packed.
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_mad.h | 14 | ||||
-rw-r--r-- | drivers/infiniband/hw/qib/qib_verbs.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h index 28874f8606f8..941d4d50d8e7 100644 --- a/drivers/infiniband/hw/qib/qib_mad.h +++ b/drivers/infiniband/hw/qib/qib_mad.h | |||
@@ -54,7 +54,7 @@ struct ib_node_info { | |||
54 | __be32 revision; | 54 | __be32 revision; |
55 | u8 local_port_num; | 55 | u8 local_port_num; |
56 | u8 vendor_id[3]; | 56 | u8 vendor_id[3]; |
57 | } __attribute__ ((packed)); | 57 | } __packed; |
58 | 58 | ||
59 | struct ib_mad_notice_attr { | 59 | struct ib_mad_notice_attr { |
60 | u8 generic_type; | 60 | u8 generic_type; |
@@ -73,7 +73,7 @@ struct ib_mad_notice_attr { | |||
73 | __be16 reserved; | 73 | __be16 reserved; |
74 | __be16 lid; /* where violation happened */ | 74 | __be16 lid; /* where violation happened */ |
75 | u8 port_num; /* where violation happened */ | 75 | u8 port_num; /* where violation happened */ |
76 | } __attribute__ ((packed)) ntc_129_131; | 76 | } __packed ntc_129_131; |
77 | 77 | ||
78 | struct { | 78 | struct { |
79 | __be16 reserved; | 79 | __be16 reserved; |
@@ -83,14 +83,14 @@ struct ib_mad_notice_attr { | |||
83 | __be32 new_cap_mask; /* new capability mask */ | 83 | __be32 new_cap_mask; /* new capability mask */ |
84 | u8 reserved3; | 84 | u8 reserved3; |
85 | u8 change_flags; /* low 3 bits only */ | 85 | u8 change_flags; /* low 3 bits only */ |
86 | } __attribute__ ((packed)) ntc_144; | 86 | } __packed ntc_144; |
87 | 87 | ||
88 | struct { | 88 | struct { |
89 | __be16 reserved; | 89 | __be16 reserved; |
90 | __be16 lid; /* lid where sys guid changed */ | 90 | __be16 lid; /* lid where sys guid changed */ |
91 | __be16 reserved2; | 91 | __be16 reserved2; |
92 | __be64 new_sys_guid; | 92 | __be64 new_sys_guid; |
93 | } __attribute__ ((packed)) ntc_145; | 93 | } __packed ntc_145; |
94 | 94 | ||
95 | struct { | 95 | struct { |
96 | __be16 reserved; | 96 | __be16 reserved; |
@@ -104,7 +104,7 @@ struct ib_mad_notice_attr { | |||
104 | u8 reserved3; | 104 | u8 reserved3; |
105 | u8 dr_trunc_hop; | 105 | u8 dr_trunc_hop; |
106 | u8 dr_rtn_path[30]; | 106 | u8 dr_rtn_path[30]; |
107 | } __attribute__ ((packed)) ntc_256; | 107 | } __packed ntc_256; |
108 | 108 | ||
109 | struct { | 109 | struct { |
110 | __be16 reserved; | 110 | __be16 reserved; |
@@ -115,7 +115,7 @@ struct ib_mad_notice_attr { | |||
115 | __be32 qp2; /* high 8 bits reserved */ | 115 | __be32 qp2; /* high 8 bits reserved */ |
116 | union ib_gid gid1; | 116 | union ib_gid gid1; |
117 | union ib_gid gid2; | 117 | union ib_gid gid2; |
118 | } __attribute__ ((packed)) ntc_257_258; | 118 | } __packed ntc_257_258; |
119 | 119 | ||
120 | } details; | 120 | } details; |
121 | }; | 121 | }; |
@@ -209,7 +209,7 @@ struct ib_pma_portcounters_cong { | |||
209 | __be64 port_rcv_packets; | 209 | __be64 port_rcv_packets; |
210 | __be64 port_xmit_wait; | 210 | __be64 port_xmit_wait; |
211 | __be64 port_adr_events; | 211 | __be64 port_adr_events; |
212 | } __attribute__ ((packed)); | 212 | } __packed; |
213 | 213 | ||
214 | #define IB_PMA_CONG_HW_CONTROL_TIMER 0x00 | 214 | #define IB_PMA_CONG_HW_CONTROL_TIMER 0x00 |
215 | #define IB_PMA_CONG_HW_CONTROL_SAMPLE 0x01 | 215 | #define IB_PMA_CONG_HW_CONTROL_SAMPLE 0x01 |
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h index 012e2c7575ad..a01c7d2cf541 100644 --- a/drivers/infiniband/hw/qib/qib_verbs.h +++ b/drivers/infiniband/hw/qib/qib_verbs.h | |||
@@ -150,14 +150,14 @@ struct ib_reth { | |||
150 | __be64 vaddr; | 150 | __be64 vaddr; |
151 | __be32 rkey; | 151 | __be32 rkey; |
152 | __be32 length; | 152 | __be32 length; |
153 | } __attribute__ ((packed)); | 153 | } __packed; |
154 | 154 | ||
155 | struct ib_atomic_eth { | 155 | struct ib_atomic_eth { |
156 | __be32 vaddr[2]; /* unaligned so access as 2 32-bit words */ | 156 | __be32 vaddr[2]; /* unaligned so access as 2 32-bit words */ |
157 | __be32 rkey; | 157 | __be32 rkey; |
158 | __be64 swap_data; | 158 | __be64 swap_data; |
159 | __be64 compare_data; | 159 | __be64 compare_data; |
160 | } __attribute__ ((packed)); | 160 | } __packed; |
161 | 161 | ||
162 | struct qib_other_headers { | 162 | struct qib_other_headers { |
163 | __be32 bth[3]; | 163 | __be32 bth[3]; |
@@ -178,7 +178,7 @@ struct qib_other_headers { | |||
178 | __be32 aeth; | 178 | __be32 aeth; |
179 | struct ib_atomic_eth atomic_eth; | 179 | struct ib_atomic_eth atomic_eth; |
180 | } u; | 180 | } u; |
181 | } __attribute__ ((packed)); | 181 | } __packed; |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * Note that UD packets with a GRH header are 8+40+12+8 = 68 bytes | 184 | * Note that UD packets with a GRH header are 8+40+12+8 = 68 bytes |
@@ -195,12 +195,12 @@ struct qib_ib_header { | |||
195 | } l; | 195 | } l; |
196 | struct qib_other_headers oth; | 196 | struct qib_other_headers oth; |
197 | } u; | 197 | } u; |
198 | } __attribute__ ((packed)); | 198 | } __packed; |
199 | 199 | ||
200 | struct qib_pio_header { | 200 | struct qib_pio_header { |
201 | __le32 pbc[2]; | 201 | __le32 pbc[2]; |
202 | struct qib_ib_header hdr; | 202 | struct qib_ib_header hdr; |
203 | } __attribute__ ((packed)); | 203 | } __packed; |
204 | 204 | ||
205 | /* | 205 | /* |
206 | * There is one struct qib_mcast for each multicast GID. | 206 | * There is one struct qib_mcast for each multicast GID. |