Commit 941affcb authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman

staging: unisys: visorbus: controlvmchannel.h: Fix #define formatting

In an effort to create a more uniform coding style within the Unisys
s-Par driver set, this patch adjusts the formatting of all #define
directives within this source file to match the following template,
and thereby eliminate irregular usage of whitespace:
Reviewed-by: default avatarTim Sell <timothy.sell@unisys.com>

The amount of whitespace used between the <token> and the <value> is
dependent on what is needed to make the surrounding #define directives
as uniform as possible.
Signed-off-by: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ffcdb101
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "channel.h" #include "channel.h"
/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */ /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
#define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID \ #define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID \
UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \ UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \
0xb9, 0x66, 0x34, 0x48, 0xb7, 0x38, 0x6b, 0x3d) 0xb9, 0x66, 0x34, 0x48, 0xb7, 0x38, 0x6b, 0x3d)
#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE \ #define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE \
ULTRA_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE
...@@ -33,24 +33,24 @@ ...@@ -33,24 +33,24 @@
* software. Note that you can usually add fields to the END of the * software. Note that you can usually add fields to the END of the
* channel struct withOUT needing to increment this. * channel struct withOUT needing to increment this.
*/ */
#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID 1 #define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID 1
#define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \ #define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \
spar_check_channel_client(ch, \ (spar_check_channel_client(ch, \
SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID, \ SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID, \
"controlvm", \ "controlvm", \
sizeof(struct spar_controlvm_channel_protocol), \ sizeof(struct spar_controlvm_channel_protocol), \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE) ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE))
/* Defines for various channel queues */ /* Defines for various channel queues */
#define CONTROLVM_QUEUE_REQUEST 0 #define CONTROLVM_QUEUE_REQUEST 0
#define CONTROLVM_QUEUE_RESPONSE 1 #define CONTROLVM_QUEUE_RESPONSE 1
#define CONTROLVM_QUEUE_EVENT 2 #define CONTROLVM_QUEUE_EVENT 2
#define CONTROLVM_QUEUE_ACK 3 #define CONTROLVM_QUEUE_ACK 3
/* Max num of messages stored during IOVM creation to be reused after crash */ /* Max num of messages stored during IOVM creation to be reused after crash */
#define CONTROLVM_CRASHMSG_MAX 2 #define CONTROLVM_CRASHMSG_MAX 2
struct spar_segment_state { struct spar_segment_state {
/* Bit 0: May enter other states */ /* Bit 0: May enter other states */
...@@ -453,78 +453,78 @@ struct spar_controlvm_parameters_header { ...@@ -453,78 +453,78 @@ struct spar_controlvm_parameters_header {
}; };
/* General Errors------------------------------------------------------[0-99] */ /* General Errors------------------------------------------------------[0-99] */
#define CONTROLVM_RESP_SUCCESS 0 #define CONTROLVM_RESP_SUCCESS 0
#define CONTROLVM_RESP_ALREADY_DONE 1 #define CONTROLVM_RESP_ALREADY_DONE 1
#define CONTROLVM_RESP_IOREMAP_FAILED 2 #define CONTROLVM_RESP_IOREMAP_FAILED 2
#define CONTROLVM_RESP_KMALLOC_FAILED 3 #define CONTROLVM_RESP_KMALLOC_FAILED 3
#define CONTROLVM_RESP_ID_UNKNOWN 4 #define CONTROLVM_RESP_ID_UNKNOWN 4
#define CONTROLVM_RESP_ID_INVALID_FOR_CLIENT 5 #define CONTROLVM_RESP_ID_INVALID_FOR_CLIENT 5
/* CONTROLVM_INIT_CHIPSET-------------------------------------------[100-199] */ /* CONTROLVM_INIT_CHIPSET-------------------------------------------[100-199] */
#define CONTROLVM_RESP_CLIENT_SWITCHCOUNT_NONZERO 100 #define CONTROLVM_RESP_CLIENT_SWITCHCOUNT_NONZERO 100
#define CONTROLVM_RESP_EXPECTED_CHIPSET_INIT 101 #define CONTROLVM_RESP_EXPECTED_CHIPSET_INIT 101
/* Maximum Limit----------------------------------------------------[200-299] */ /* Maximum Limit----------------------------------------------------[200-299] */
#define CONTROLVM_RESP_ERROR_MAX_BUSES 201 /* BUS_CREATE */ #define CONTROLVM_RESP_ERROR_MAX_BUSES 201 /* BUS_CREATE */
#define CONTROLVM_RESP_ERROR_MAX_DEVICES 202 /* DEVICE_CREATE */ #define CONTROLVM_RESP_ERROR_MAX_DEVICES 202 /* DEVICE_CREATE */
/* Payload and Parameter Related------------------------------------[400-499] */ /* Payload and Parameter Related------------------------------------[400-499] */
#define CONTROLVM_RESP_PAYLOAD_INVALID 400 /* SWITCH_ATTACHEXTPORT, #define CONTROLVM_RESP_PAYLOAD_INVALID 400 /* SWITCH_ATTACHEXTPORT,
* DEVICE_CONFIGURE * DEVICE_CONFIGURE
*/ */
#define CONTROLVM_RESP_INITIATOR_PARAMETER_INVALID 401 /* Multiple */ #define CONTROLVM_RESP_INITIATOR_PARAMETER_INVALID 401 /* Multiple */
#define CONTROLVM_RESP_TARGET_PARAMETER_INVALID 402 /* DEVICE_CONFIGURE */ #define CONTROLVM_RESP_TARGET_PARAMETER_INVALID 402 /* DEVICE_CONFIGURE */
#define CONTROLVM_RESP_CLIENT_PARAMETER_INVALID 403 /* DEVICE_CONFIGURE */ #define CONTROLVM_RESP_CLIENT_PARAMETER_INVALID 403 /* DEVICE_CONFIGURE */
/* Specified[Packet Structure] Value-------------------------------[500-599] */ /* Specified[Packet Structure] Value-------------------------------[500-599] */
#define CONTROLVM_RESP_BUS_INVALID 500 /* SWITCH_ATTACHINTPORT, #define CONTROLVM_RESP_BUS_INVALID 500 /* SWITCH_ATTACHINTPORT,
* BUS_CONFIGURE, * BUS_CONFIGURE,
* DEVICE_CREATE, * DEVICE_CREATE,
* DEVICE_CONFIG * DEVICE_CONFIG
* DEVICE_DESTROY * DEVICE_DESTROY
*/ */
#define CONTROLVM_RESP_DEVICE_INVALID 501 /* SWITCH_ATTACHINTPORT */ #define CONTROLVM_RESP_DEVICE_INVALID 501 /* SWITCH_ATTACHINTPORT*/
/* DEVICE_CREATE, /* DEVICE_CREATE,
* DEVICE_CONFIGURE, * DEVICE_CONFIGURE,
* DEVICE_DESTROY * DEVICE_DESTROY
*/ */
#define CONTROLVM_RESP_CHANNEL_INVALID 502 /* DEVICE_CREATE, #define CONTROLVM_RESP_CHANNEL_INVALID 502 /* DEVICE_CREATE,
* DEVICE_CONFIGURE * DEVICE_CONFIGURE
*/ */
/* Partition Driver Callback Interface----------------------[600-699] */ /* Partition Driver Callback Interface----------------------[600-699] */
#define CONTROLVM_RESP_VIRTPCI_DRIVER_FAILURE 604 /* BUS_CREATE, #define CONTROLVM_RESP_VIRTPCI_DRIVER_FAILURE 604 /* BUS_CREATE,
* BUS_DESTROY, * BUS_DESTROY,
* DEVICE_CREATE, * DEVICE_CREATE,
* DEVICE_DESTROY * DEVICE_DESTROY
*/ */
/* Unable to invoke VIRTPCI callback */ /* Unable to invoke VIRTPCI callback */
#define CONTROLVM_RESP_VIRTPCI_DRIVER_CALLBACK_ERROR 605 /* BUS_CREATE, #define CONTROLVM_RESP_VIRTPCI_DRIVER_CALLBACK_ERROR 605 /* BUS_CREATE,
* BUS_DESTROY, * BUS_DESTROY,
* DEVICE_CREATE, * DEVICE_CREATE,
* DEVICE_DESTROY * DEVICE_DESTROY
*/ */
/* VIRTPCI Callback returned error */ /* VIRTPCI Callback returned error */
#define CONTROLVM_RESP_GENERIC_DRIVER_CALLBACK_ERROR 606 #define CONTROLVM_RESP_GENERIC_DRIVER_CALLBACK_ERROR 606
/* SWITCH_ATTACHEXTPORT, /* SWITCH_ATTACHEXTPORT,
* SWITCH_DETACHEXTPORT * SWITCH_DETACHEXTPORT
* DEVICE_CONFIGURE * DEVICE_CONFIGURE
*/ */
/* generic device callback returned error */ /* generic device callback returned error */
/* Bus Related------------------------------------------------------[700-799] */ /* Bus Related------------------------------------------------------[700-799] */
#define CONTROLVM_RESP_ERROR_BUS_DEVICE_ATTACHED 700 /* BUS_DESTROY */ #define CONTROLVM_RESP_ERROR_BUS_DEVICE_ATTACHED 700 /* BUS_DESTROY */
/* Channel Related--------------------------------------------------[800-899] */ /* Channel Related--------------------------------------------------[800-899] */
#define CONTROLVM_RESP_CHANNEL_TYPE_UNKNOWN 800 /* GET_CHANNELINFO, #define CONTROLVM_RESP_CHANNEL_TYPE_UNKNOWN 800 /* GET_CHANNELINFO,
* DEVICE_DESTROY * DEVICE_DESTROY
*/ */
#define CONTROLVM_RESP_CHANNEL_SIZE_TOO_SMALL 801 /* DEVICE_CREATE */ #define CONTROLVM_RESP_CHANNEL_SIZE_TOO_SMALL 801 /* DEVICE_CREATE */
/* Chipset Shutdown Related---------------------------------------[1000-1099] */ /* Chipset Shutdown Related---------------------------------------[1000-1099] */
#define CONTROLVM_RESP_CHIPSET_SHUTDOWN_FAILED 1000 #define CONTROLVM_RESP_CHIPSET_SHUTDOWN_FAILED 1000
#define CONTROLVM_RESP_CHIPSET_SHUTDOWN_ALREADY_ACTIVE 1001 #define CONTROLVM_RESP_CHIPSET_SHUTDOWN_ALREADY_ACTIVE 1001
/* Chipset Stop Related-------------------------------------------[1100-1199] */ /* Chipset Stop Related-------------------------------------------[1100-1199] */
#define CONTROLVM_RESP_CHIPSET_STOP_FAILED_BUS 1100 #define CONTROLVM_RESP_CHIPSET_STOP_FAILED_BUS 1100
#define CONTROLVM_RESP_CHIPSET_STOP_FAILED_SWITCH 1101 #define CONTROLVM_RESP_CHIPSET_STOP_FAILED_SWITCH 1101
/* Device Related-------------------------------------------------[1400-1499] */ /* Device Related-------------------------------------------------[1400-1499] */
#define CONTROLVM_RESP_DEVICE_UDEV_TIMEOUT 1400 #define CONTROLVM_RESP_DEVICE_UDEV_TIMEOUT 1400
#endif /* __CONTROLVMCHANNEL_H__ */ #endif /* __CONTROLVMCHANNEL_H__ */
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