Commit cd2f87e6 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: clean up line spacing in iochannel.h

Get rid of extra blank lines in iochannel.h
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f207671f
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
* this file. Note: Everything is OS-independent because this file is * this file. Note: Everything is OS-independent because this file is
* used by Windows, Linux and possible EFI drivers. */ * used by Windows, Linux and possible EFI drivers. */
/* /*
* Communication flow between the IOPart and GuestPart uses the channel headers * Communication flow between the IOPart and GuestPart uses the channel headers
* channel state. The following states are currently being used: * channel state. The following states are currently being used:
...@@ -89,7 +88,6 @@ ...@@ -89,7 +88,6 @@
* Everything necessary to handle SCSI & NIC traffic between Guest Partition and * Everything necessary to handle SCSI & NIC traffic between Guest Partition and
* IO Partition is defined below. */ * IO Partition is defined below. */
/* /*
* Defines and enums. * Defines and enums.
*/ */
...@@ -236,7 +234,6 @@ typedef enum { VDISK_MGMT_ACQUIRE = 1, VDISK_MGMT_RELEASE, ...@@ -236,7 +234,6 @@ typedef enum { VDISK_MGMT_ACQUIRE = 1, VDISK_MGMT_RELEASE,
/* /*
* structs with pragma pack */ * structs with pragma pack */
/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */ /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */ /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
...@@ -404,12 +401,10 @@ struct uiscmdrsp_scsi { ...@@ -404,12 +401,10 @@ struct uiscmdrsp_scsi {
} \ } \
} while (0) } while (0)
/* /*
* Struct & Defines to support sense information. * Struct & Defines to support sense information.
*/ */
/* The following struct is returned in sensebuf field in uiscmdrsp_scsi. It is /* The following struct is returned in sensebuf field in uiscmdrsp_scsi. It is
* initialized in exactly the manner that is recommended in Windows (hence the * initialized in exactly the manner that is recommended in Windows (hence the
* odd values). * odd values).
...@@ -478,7 +473,6 @@ struct net_pkt_xmt { ...@@ -478,7 +473,6 @@ struct net_pkt_xmt {
* each fragment */ * each fragment */
char ethhdr[ETH_HEADER_SIZE]; /* the ethernet header */ char ethhdr[ETH_HEADER_SIZE]; /* the ethernet header */
struct { struct {
/* these are needed for csum at uisnic end */ /* these are needed for csum at uisnic end */
u8 valid; /* 1 = rest of this struct is valid - else u8 valid; /* 1 = rest of this struct is valid - else
* ignore */ * ignore */
...@@ -528,7 +522,6 @@ struct net_pkt_rcvpost { ...@@ -528,7 +522,6 @@ struct net_pkt_rcvpost {
}; };
struct net_pkt_rcv { struct net_pkt_rcv {
/* the number of receive buffers that can be chained */ /* the number of receive buffers that can be chained */
/* is based on max mtu and size of each rcv buf */ /* is based on max mtu and size of each rcv buf */
u32 rcv_done_len; /* length of received data */ u32 rcv_done_len; /* length of received data */
...@@ -727,7 +720,6 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL { ...@@ -727,7 +720,6 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
* INLINE functions for initializing and accessing I/O data channels * INLINE functions for initializing and accessing I/O data channels
*/ */
#define NUMSIGNALS(x, q) (((ULTRA_IO_CHANNEL_PROTOCOL *)(x))->q.MaxSignalSlots) #define NUMSIGNALS(x, q) (((ULTRA_IO_CHANNEL_PROTOCOL *)(x))->q.MaxSignalSlots)
#define SIZEOF_PROTOCOL (COVER(sizeof(ULTRA_IO_CHANNEL_PROTOCOL), 64)) #define SIZEOF_PROTOCOL (COVER(sizeof(ULTRA_IO_CHANNEL_PROTOCOL), 64))
#define SIZEOF_CMDRSP (COVER(sizeof(struct uiscmdrsp), 64)) #define SIZEOF_CMDRSP (COVER(sizeof(struct uiscmdrsp), 64))
...@@ -781,7 +773,6 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL { ...@@ -781,7 +773,6 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
return 0; \ return 0; \
} while (0) } while (0)
#define ULTRA_IO_CHANNEL_SERVER_READY(x, chanId, logCtx) \ #define ULTRA_IO_CHANNEL_SERVER_READY(x, chanId, logCtx) \
ULTRA_CHANNEL_SERVER_TRANSITION(x, chanId, SrvState, CHANNELSRV_READY, \ ULTRA_CHANNEL_SERVER_TRANSITION(x, chanId, SrvState, CHANNELSRV_READY, \
logCtx) logCtx)
...@@ -864,7 +855,6 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, ...@@ -864,7 +855,6 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
* pfn-off-size entires. * pfn-off-size entires.
*/ */
/* we deal with 4K page sizes when we it comes to passing page information /* we deal with 4K page sizes when we it comes to passing page information
* between */ * between */
/* Guest and IOPartition. */ /* Guest and IOPartition. */
...@@ -894,7 +884,6 @@ add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used ...@@ -894,7 +884,6 @@ add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used
firstlen = PI_PAGE_SIZE - inp_off; firstlen = PI_PAGE_SIZE - inp_off;
if (inp_len <= firstlen) { if (inp_len <= firstlen) {
/* the input entry spans only one page - add as is */ /* the input entry spans only one page - add as is */
if (index >= max_pi_arr_entries) if (index >= max_pi_arr_entries)
return 0; return 0;
...@@ -920,7 +909,6 @@ add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used ...@@ -920,7 +909,6 @@ add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used
pi_arr[index + i].pi_len = pi_arr[index + i].pi_len =
(u16) MINNUM(len, (u32) PI_PAGE_SIZE); (u16) MINNUM(len, (u32) PI_PAGE_SIZE);
} }
} }
return index + i; return index + i;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment