leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: unisys: visorbus: remove #pragma directive

Browse Source 
This patch removes the #pragma directive from visorchannel.h
and adds the __packed keyword to all structs to suppress structure
padding.

Signed-off-by: Jon Frisch <jon.frisch@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jon Frisch 2017-03-17 11:27:16 -04:00 committed by Greg Kroah-Hartman
parent a7d2ab20f8
commit 2c97273edd
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/unisys/visorbus/vbuschannel.h
View File

@ -51,8 +51,6 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, \
SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)
#pragma pack(push, 1) /* both GCC and VC now allow this pragma */
/*
* An array of this struct is present in the channel area for each vbus.
* (See vbuschannel.h.)
@ -64,7 +62,7 @@ struct ultra_vbus_deviceinfo {
u8 drvname[16]; /* driver .sys file name */
u8 infostrs[96]; /* kernel version */
u8 reserved[128]; /* pad size to 256 bytes */
};
} __packed;
/*
* vbuschannel_print_devinfo() - format a struct ultra_vbus_deviceinfo
@ -113,7 +111,7 @@ struct spar_vbus_headerinfo {
u32 dev_info_offset; /* byte offset from beginning of this struct */
/* to the DevInfo array (below) */
u8 reserved[104];
};
} __packed;
struct spar_vbus_channel_protocol {
struct channel_header channel_header; /* initialized by server */
@ -125,8 +123,6 @@ struct spar_vbus_channel_protocol {
/* describes client bus device and driver */
struct ultra_vbus_deviceinfo dev_info[0];
/* describes client device and driver for each device on the bus */
};
#pragma pack(pop)
} __packed;
#endif