From: Erik Arfvidson Date: Mon, 21 Nov 2016 17:15:41 +0000 (-0500) Subject: staging: unisys: include: fix pound defines X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b18f9c676f939038c4e61b40ba7d3e8e2a640a5f;p=linux-beck.git staging: unisys: include: fix pound defines The purpose of this patch is to add style consistency and beautify the entire file. This patch removes unused pound defines and cleans up spacing and tabbing of pound defines. Signed-off-by: Erik Arfvidson Signed-off-by: David Kershner Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index eeca16ecbe84..c43da782f37e 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/drivers/staging/unisys/include/iochannel.h @@ -117,12 +117,12 @@ enum net_types { }; -#define ETH_HEADER_SIZE 14 /* size of ethernet header */ +#define ETH_HEADER_SIZE 14 /* size of ethernet header */ -#define ETH_MIN_DATA_SIZE 46 /* minimum eth data size */ -#define ETH_MIN_PACKET_SIZE (ETH_HEADER_SIZE + ETH_MIN_DATA_SIZE) +#define ETH_MIN_DATA_SIZE 46 /* minimum eth data size */ +#define ETH_MIN_PACKET_SIZE (ETH_HEADER_SIZE + ETH_MIN_DATA_SIZE) -#define ETH_MAX_MTU 16384 /* maximum data size */ +#define ETH_MAX_MTU 16384 /* maximum data size */ #ifndef MAX_MACADDR_LEN #define MAX_MACADDR_LEN 6 /* number of bytes in MAC address */ @@ -491,8 +491,6 @@ struct uiscmdrsp_vdiskmgmt { /* Result of taskmgmt command - set by IOPart - values are: */ char result; - -#define VDISK_MGMT_FAILED 0 } __packed; /* Keeping cmd and rsp info in one structure for now cmd rsp packet for SCSI */ @@ -549,12 +547,8 @@ struct spar_io_channel_protocol { } __packed; /* INLINE functions for initializing and accessing I/O data channels. */ -#define SIZEOF_PROTOCOL (COVER(sizeof(struct spar_io_channel_protocol), 64)) #define SIZEOF_CMDRSP (COVER(sizeof(struct uiscmdrsp), 64)) -#define MIN_IO_CHANNEL_SIZE COVER(SIZEOF_PROTOCOL + \ - 2 * MIN_NUMSIGNALS * SIZEOF_CMDRSP, 4096) - /* Use 4K page sizes when passing page info between Guest and IOPartition. */ #define PI_PAGE_SIZE 0x1000 #define PI_PAGE_MASK 0x0FFF