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

Commit 58607307 authored by Chris Forbes's avatar Chris Forbes Committed by Greg Kroah-Hartman
Browse files

drivers: usb: atm: ueagle-atm: use __packed 



Replaced __attribute__ ((packed)) with __packed;

Signed-off-by: default avatarChris Forbes <chrisf@ijw.co.nz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2cb30bb1

drivers/usb/atm/ueagle-atm.c

+17 −17
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ struct uea_cmvs_v1 { 
	u32 address;

	u16 offset;

	u32 data;

} __attribute__ ((packed));

} __packed;



struct uea_cmvs_v2 {

	u32 group;

	u32 address;

	u32 offset;

	u32 data;

} __attribute__ ((packed));

} __packed;



/* information about currently processed cmv */

struct cmv_dsc_e1 {
@@ -352,7 +352,7 @@ struct block_index { 
	__le32 PageAddress;

	__le16 dummy1;

	__le16 PageNumber;

} __attribute__ ((packed));

} __packed;



#define E4_IS_BOOT_PAGE(PageSize) ((le32_to_cpu(PageSize)) & 0x80000000)

#define E4_PAGE_BYTES(PageSize) ((le32_to_cpu(PageSize) & 0x7fffffff) * 4)
@@ -367,7 +367,7 @@ struct l1_code { 
	u8 page_number_to_block_index[E4_MAX_PAGE_NUMBER];

	struct block_index page_header[E4_NO_SWAPPAGE_HEADERS];

	u8 code[0];

} __attribute__ ((packed));

} __packed;



/* structures describing a block within a DSP page */

struct block_info_e1 {
@@ -377,7 +377,7 @@ struct block_info_e1 { 
	__le16 wOvlOffset;

	__le16 wOvl;		/* overlay */

	__le16 wLast;

} __attribute__ ((packed));

} __packed;

#define E1_BLOCK_INFO_SIZE 12



struct block_info_e4 {
@@ -387,7 +387,7 @@ struct block_info_e4 { 
	__be32 dwSize;

	__be32 dwAddress;

	__be16 wReserved;

} __attribute__ ((packed));

} __packed;

#define E4_BLOCK_INFO_SIZE 14



#define UEA_BIHDR 0xabcd
@@ -467,7 +467,7 @@ struct cmv_e1 { 
	__le32 dwSymbolicAddress;

	__le16 wOffsetAddress;

	__le32 dwData;

} __attribute__ ((packed));

} __packed;



struct cmv_e4 {

	__be16 wGroup;
@@ -475,17 +475,17 @@ struct cmv_e4 { 
	__be16 wOffset;

	__be16 wAddress;

	__be32 dwData[6];

} __attribute__ ((packed));

} __packed;



/* structures representing swap information */

struct swap_info_e1 {

	__u8 bSwapPageNo;

	__u8 bOvl;		/* overlay */

} __attribute__ ((packed));

} __packed;



struct swap_info_e4 {

	__u8 bSwapPageNo;

} __attribute__ ((packed));

} __packed;



/* structures representing interrupt data */

#define e1_bSwapPageNo	u.e1.s1.swapinfo.bSwapPageNo
@@ -499,23 +499,23 @@ union intr_data_e1 { 
	struct {

		struct swap_info_e1 swapinfo;

		__le16 wDataSize;

	} __attribute__ ((packed)) s1;

	} __packed s1;

	struct {

		struct cmv_e1 cmv;

		__le16 wDataSize;

	} __attribute__ ((packed)) s2;

} __attribute__ ((packed));

	} __packed s2;

} __packed;



union intr_data_e4 {

	struct {

		struct swap_info_e4 swapinfo;

		__le16 wDataSize;

	} __attribute__ ((packed)) s1;

	} __packed s1;

	struct {

		struct cmv_e4 cmv;

		__le16 wDataSize;

	} __attribute__ ((packed)) s2;

} __attribute__ ((packed));

	} __packed s2;

} __packed;



struct intr_pkt {

	__u8 bType;
@@ -528,7 +528,7 @@ struct intr_pkt { 
		union intr_data_e1 e1;

		union intr_data_e4 e4;

	} u;

} __attribute__ ((packed));

} __packed;



#define E1_INTR_PKT_SIZE 28

#define E4_INTR_PKT_SIZE 64