[PATCH 13/14] staging: unisys: clean up comments in controlvmchannel.h message packet

Benjamin Romer benjamin.romer at unisys.com
Tue Aug 5 18:57:57 UTC 2014


The comments for the large union CONTROLVM_MESSAGE_PACKET were inconsistently
placed and one extended past the 80 char limit. These are cleaned up.

Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
 .../include/channels/controlvmchannel.h            | 41 ++++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index d08c198..9028bea 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -322,8 +322,9 @@ typedef struct _CONTROLVM_MESSAGE_DEVICE_CONFIGURE  {
 /* This is the format for a message in any ControlVm queue. */
 typedef struct _CONTROLVM_MESSAGE_PACKET  {
 	union  {
-
 		/* BEGIN Request messages */
+
+		/* for CONTROLVM_BUS_CREATE */
 		struct  {
 			u32 busNo;	      /*< bus # (0..n-1) from the msg
 					       * receiver's perspective */
@@ -339,14 +340,18 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 			uuid_le busDataTypeGuid;/*< indicates format of data in
 						    bus channel */
 			uuid_le busInstGuid;    /*< instance guid for the bus */
-		} createBus;	/* for CONTROLVM_BUS_CREATE */
+		} createBus;
+
+		/* for CONTROLVM_BUS_DESTROY */
 		struct  {
 			u32 busNo;	      /*< bus # (0..n-1) from the msg
 					       * receiver's perspective */
 
 	    /* Control uses header SegmentIndex field to access bus number... */
 			u32 reserved;	/* Natural alignment purposes */
-		} destroyBus;	/* for CONTROLVM_BUS_DESTROY */
+		} destroyBus;
+
+		/* for CONTROLVM_BUS_CONFIGURE */
 		struct  {
 			u32 busNo;		    /*< bus # (0..n-1) from the
 						     * msg receiver's
@@ -365,10 +370,12 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 					 *   corresponding
 					 *   sendBusInterruptHandle is kept in
 					 *   CP. */
-		} configureBus;	/* for CONTROLVM_BUS_CONFIGURE */
+		} configureBus;
 
 		/* for CONTROLVM_DEVICE_CREATE */
 		CONTROLVM_PACKET_DEVICE_CREATE createDevice;
+
+		/* for CONTROLVM_DEVICE_DESTROY */
 		struct  {
 			u32 busNo;	      /*< bus # (0..n-1) from the msg
 					       * receiver's perspective */
@@ -376,10 +383,12 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 	    /* Control uses header SegmentIndex field to access bus number... */
 			u32 devNo;	      /*< bus-relative (0..n-1) device
 					       * number */
-		} destroyDevice;	/* for CONTROLVM_DEVICE_DESTROY */
+		} destroyDevice;
 
 		/* for CONTROLVM_DEVICE_CONFIGURE */
 		CONTROLVM_PACKET_DEVICE_CONFIGURE configureDevice;
+
+		/* for CONTROLVM_DEVICE_RECONFIGURE */
 		struct  {
 			u32 busNo;	      /*< bus # (0..n-1) from the msg
 					       * receiver's perspective */
@@ -387,12 +396,16 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 	    /* Control uses header SegmentIndex field to access bus number... */
 			u32 devNo;	      /*< bus-relative (0..n-1) device
 					       * number */
-		} reconfigureDevice;	/* for CONTROLVM_DEVICE_RECONFIGURE */
+		} reconfigureDevice;
+
+		/* for CONTROLVM_BUS_CHANGESTATE */
 		struct  {
 			u32 busNo;
 			ULTRA_SEGMENT_STATE state;
 			u8 reserved[2];	/* Natural alignment purposes */
-		} busChangeState;	/* for CONTROLVM_BUS_CHANGESTATE */
+		} busChangeState;
+
+		/* for CONTROLVM_DEVICE_CHANGESTATE */
 		struct  {
 			u32 busNo;
 			u32 devNo;
@@ -403,13 +416,17 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 			/* remaining bits in this 32-bit word are available */
 			} flags;
 			u8 reserved[2];	/* Natural alignment purposes */
-		} deviceChangeState;	/* for CONTROLVM_DEVICE_CHANGESTATE */
+		} deviceChangeState;
+
+		/* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */
 		struct  {
 			u32 busNo;
 			u32 devNo;
 			ULTRA_SEGMENT_STATE state;
 			u8 reserved[6];	/* Natural alignment purposes */
-		} deviceChangeStateEvent; /* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */
+		} deviceChangeStateEvent;
+
+		/* for CONTROLVM_CHIPSET_INIT */
 		struct  {
 			u32 busCount; /*< indicates the max number of busses */
 			u32 switchCount; /*< indicates the max number of
@@ -417,11 +434,13 @@ typedef struct _CONTROLVM_MESSAGE_PACKET  {
 					  *   partition only) */
 			ULTRA_CHIPSET_FEATURE features;
 			u32 platformNumber;	/* Platform Number */
-		} initChipset;	/* for CONTROLVM_CHIPSET_INIT */
+		} initChipset;
+
+		/* for CONTROLVM_CHIPSET_SELFTEST */
 		struct  {
 			u32 Options; /*< reserved */
 			u32 Test;    /*< bit 0 set to run embedded selftest */
-		} chipsetSelftest;	/* for CONTROLVM_CHIPSET_SELFTEST */
+		} chipsetSelftest;
 
 		    /* END Request messages */
 
-- 
1.9.1



More information about the devel mailing list