Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78a58864 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Fix checkpatch __packed warnings 



Convert __attribute__ ((packed)) to __packed.

Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 603e7729

drivers/infiniband/hw/qib/qib_mad.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ struct ib_node_info { 
	__be32 revision;

	__be32 revision;

	u8 local_port_num;

	u8 local_port_num;

	u8 vendor_id[3];

	u8 vendor_id[3];

} __attribute__ ((packed));

} __packed;





struct ib_mad_notice_attr {

struct ib_mad_notice_attr {

	u8 generic_type;

	u8 generic_type;
@@ -73,7 +73,7 @@ struct ib_mad_notice_attr { 
			__be16	reserved;

			__be16	reserved;

			__be16	lid;		/* where violation happened */

			__be16	lid;		/* where violation happened */

			u8	port_num;	/* where violation happened */

			u8	port_num;	/* where violation happened */

		} __attribute__ ((packed)) ntc_129_131;

		} __packed ntc_129_131;





		struct {

		struct {

			__be16	reserved;

			__be16	reserved;
@@ -83,14 +83,14 @@ struct ib_mad_notice_attr { 
			__be32	new_cap_mask;	/* new capability mask */

			__be32	new_cap_mask;	/* new capability mask */

			u8	reserved3;

			u8	reserved3;

			u8	change_flags;	/* low 3 bits only */

			u8	change_flags;	/* low 3 bits only */

		} __attribute__ ((packed)) ntc_144;

		} __packed ntc_144;





		struct {

		struct {

			__be16	reserved;

			__be16	reserved;

			__be16	lid;		/* lid where sys guid changed */

			__be16	lid;		/* lid where sys guid changed */

			__be16	reserved2;

			__be16	reserved2;

			__be64	new_sys_guid;

			__be64	new_sys_guid;

		} __attribute__ ((packed)) ntc_145;

		} __packed ntc_145;





		struct {

		struct {

			__be16	reserved;

			__be16	reserved;
@@ -104,7 +104,7 @@ struct ib_mad_notice_attr { 
			u8	reserved3;

			u8	reserved3;

			u8	dr_trunc_hop;

			u8	dr_trunc_hop;

			u8	dr_rtn_path[30];

			u8	dr_rtn_path[30];

		} __attribute__ ((packed)) ntc_256;

		} __packed ntc_256;





		struct {

		struct {

			__be16		reserved;

			__be16		reserved;
@@ -115,7 +115,7 @@ struct ib_mad_notice_attr { 
			__be32		qp2;	/* high 8 bits reserved */

			__be32		qp2;	/* high 8 bits reserved */

			union ib_gid	gid1;

			union ib_gid	gid1;

			union ib_gid	gid2;

			union ib_gid	gid2;

		} __attribute__ ((packed)) ntc_257_258;

		} __packed ntc_257_258;





	} details;

	} details;

};

};
@@ -209,7 +209,7 @@ struct ib_pma_portcounters_cong { 
	__be64 port_rcv_packets;

	__be64 port_rcv_packets;

	__be64 port_xmit_wait;

	__be64 port_xmit_wait;

	__be64 port_adr_events;

	__be64 port_adr_events;

} __attribute__ ((packed));

} __packed;





#define IB_PMA_CONG_HW_CONTROL_TIMER            0x00

#define IB_PMA_CONG_HW_CONTROL_TIMER            0x00

#define IB_PMA_CONG_HW_CONTROL_SAMPLE           0x01

#define IB_PMA_CONG_HW_CONTROL_SAMPLE           0x01

drivers/infiniband/hw/qib/qib_verbs.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -150,14 +150,14 @@ struct ib_reth { 
	__be64 vaddr;

	__be64 vaddr;

	__be32 rkey;

	__be32 rkey;

	__be32 length;

	__be32 length;

} __attribute__ ((packed));

} __packed;





struct ib_atomic_eth {

struct ib_atomic_eth {

	__be32 vaddr[2];        /* unaligned so access as 2 32-bit words */

	__be32 vaddr[2];        /* unaligned so access as 2 32-bit words */

	__be32 rkey;

	__be32 rkey;

	__be64 swap_data;

	__be64 swap_data;

	__be64 compare_data;

	__be64 compare_data;

} __attribute__ ((packed));

} __packed;





struct qib_other_headers {

struct qib_other_headers {

	__be32 bth[3];

	__be32 bth[3];
@@ -178,7 +178,7 @@ struct qib_other_headers { 
		__be32 aeth;

		__be32 aeth;

		struct ib_atomic_eth atomic_eth;

		struct ib_atomic_eth atomic_eth;

	} u;

	} u;

} __attribute__ ((packed));

} __packed;





/*

/*

 * Note that UD packets with a GRH header are 8+40+12+8 = 68 bytes

 * Note that UD packets with a GRH header are 8+40+12+8 = 68 bytes
@@ -195,12 +195,12 @@ struct qib_ib_header { 
		} l;

		} l;

		struct qib_other_headers oth;

		struct qib_other_headers oth;

	} u;

	} u;

} __attribute__ ((packed));

} __packed;





struct qib_pio_header {

struct qib_pio_header {

	__le32 pbc[2];

	__le32 pbc[2];

	struct qib_ib_header hdr;

	struct qib_ib_header hdr;

} __attribute__ ((packed));

} __packed;





/*

/*

 * There is one struct qib_mcast for each multicast GID.

 * There is one struct qib_mcast for each multicast GID.