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

Commit e1325ad1 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h 



This patch fixes the following warning reported
by checkpatch.pl: "WARNING: __packed is preferred
over __attribute__((packed))".

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5db647a3

drivers/staging/bcm/Adapter.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -12,26 +12,26 @@ struct _LEADER { 
	USHORT	PLength;

	USHORT	PLength;

	UCHAR	Status;

	UCHAR	Status;

	UCHAR	Unused[3];

	UCHAR	Unused[3];

} __attribute__((packed));

} __packed;

typedef struct _LEADER LEADER, *PLEADER;

typedef struct _LEADER LEADER, *PLEADER;





struct _PACKETTOSEND {

struct _PACKETTOSEND {

	LEADER	Leader;

	LEADER	Leader;

	UCHAR	ucPayload;

	UCHAR	ucPayload;

} __attribute__((packed));

} __packed;

typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;

typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;





struct _CONTROL_PACKET {

struct _CONTROL_PACKET {

	PVOID	ControlBuff;

	PVOID	ControlBuff;

	UINT	ControlBuffLen;

	UINT	ControlBuffLen;

	struct _CONTROL_PACKET *next;

	struct _CONTROL_PACKET *next;

} __attribute__((packed));

} __packed;

typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;

typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;





struct link_request {

struct link_request {

	LEADER	Leader;

	LEADER	Leader;

	UCHAR	szData[4];

	UCHAR	szData[4];

} __attribute__((packed));

} __packed;

typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;

typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;





/* classification extension is added */

/* classification extension is added */
@@ -534,14 +534,14 @@ struct _ETH_HEADER_STRUC { 
	UCHAR	au8DestinationAddress[6];

	UCHAR	au8DestinationAddress[6];

	UCHAR	au8SourceAddress[6];

	UCHAR	au8SourceAddress[6];

	USHORT	u16Etype;

	USHORT	u16Etype;

} __attribute__((packed));

} __packed;

typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;

typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;





typedef struct FirmwareInfo {

typedef struct FirmwareInfo {

	void	__user *pvMappedFirmwareAddress;

	void	__user *pvMappedFirmwareAddress;

	ULONG	u32FirmwareLength;

	ULONG	u32FirmwareLength;

	ULONG	u32StartingAddress;

	ULONG	u32StartingAddress;

} __attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;

} __packed FIRMWARE_INFO, *PFIRMWARE_INFO;





/* holds the value of net_device structure.. */

/* holds the value of net_device structure.. */

extern struct net_device *gblpnetdev;

extern struct net_device *gblpnetdev;