From: Veronika Kabatova <veronicca114@gmail.com>
Date: Wed, 8 Oct 2014 01:59:55 +0000 (+0200)
Subject: staging: unisys: Remove typedef and rename enum to lowercase
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d8ad8b0cad4cb9596b751a2dc10ff7559cee721c;p=deliverable%2Flinux.git

staging: unisys: Remove typedef and rename enum to lowercase

Remove typedef and rename enum to lowercase (control_vm_id)

Signed-off-by: Veronika Kabátová <veronicca114@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index cfd99997cfee..f7ca6d167d60 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -88,7 +88,7 @@ static const uuid_le UltraControlvmChannelProtocolGuid =
  *  - issued on the EventQueue queue (q #2) in the ControlVm channel
  *  - responded to on the EventAckQueue queue (q #3) in the ControlVm channel
  */
-typedef enum  {
+enum control_vm_id {
 	CONTROLVM_INVALID = 0,
 	/* SWITCH commands required Parameter: SwitchNumber  */
 	/* BUS commands required Parameter: BusNumber  */
@@ -117,7 +117,7 @@ typedef enum  {
 	CONTROLVM_CHIPSET_READY = 0x304,	/* CP --> SP */
 	CONTROLVM_CHIPSET_SELFTEST = 0x305,	/* CP --> SP */
 
-} CONTROLVM_ID;
+};
 
 struct irq_info {
 	 /**< specifies interrupt info. It is used to send interrupts
@@ -239,7 +239,7 @@ typedef enum {
  *  looking at the flags.response field.
  */
 typedef struct _CONTROLVM_MESSAGE_HEADER  {
-	u32 Id;		/* See CONTROLVM_ID. */
+	u32 Id;		/* See control_vm_id. */
 	/* For requests, indicates the message type. */
 	/* For responses, indicates the type of message we are responding to. */
 
diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 677ed7e609af..f8ffa0263e29 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -155,7 +155,7 @@ u64 uislib_storage_channel(int client_id);
 #endif
 int uislib_get_owned_pdest(struct uisscsi_dest *pdest);
 
-int uislib_send_event(CONTROLVM_ID id, CONTROLVM_MESSAGE_PACKET *event);
+int uislib_send_event(enum control_vm_id id, CONTROLVM_MESSAGE_PACKET *event);
 
 /* structure used by vhba & vnic to keep track of queue & thread info */
 struct chaninfo {
diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index 23834765a468..cb93da931f75 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -82,7 +82,7 @@ typedef struct {
 	uuid_le devInstGuid;
 	VISORCHIPSET_STATE state;
 	VISORCHIPSET_CHANNEL_INFO chanInfo;
-	u32 Reserved1;		/* CONTROLVM_ID */
+	u32 Reserved1;		/* control_vm_id */
 	u64 Reserved2;
 	u32 switchNo;		/* when devState.attached==1 */
 	u32 internalPortNo;	/* when devState.attached==1 */
@@ -169,7 +169,7 @@ typedef struct {
 	u8 *authService3;
 	u8 *securityContext;
 	u64 Reserved;
-	u32 Reserved2;		/* CONTROLVM_ID */
+	u32 Reserved2;		/* control_vm_id */
 	struct device dev;
 	BOOL dev_exists;
 	CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
@@ -192,7 +192,7 @@ typedef struct {
 	u8 *ipGateway;
 	u8 *ipDNS;
 	u64 Reserved1;
-	u32 Reserved2;		/* CONTROLVM_ID */
+	u32 Reserved2;		/* control_vm_id */
 	struct device dev;
 	BOOL dev_exists;
 	CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
@@ -209,7 +209,7 @@ typedef struct {
 	u32 busNo;		/* valid only when state.attached == 1 */
 	u32 devNo;		/* valid only when state.attached == 1 */
 	u64 Reserved1;
-	u32 Reserved2;		/* CONTROLVM_ID */
+	u32 Reserved2;		/* control_vm_id */
 	CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
 	MYPROCOBJECT *procObject;
 
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 320124a240ac..ee03c59dc889 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -817,7 +817,7 @@ visorchipset_save_message(CONTROLVM_MESSAGE *msg, CRASH_OBJ_TYPE type)
 EXPORT_SYMBOL_GPL(visorchipset_save_message);
 
 static void
-bus_responder(CONTROLVM_ID cmdId, ulong busNo, int response)
+bus_responder(enum control_vm_id cmdId, ulong busNo, int response)
 {
 	VISORCHIPSET_BUS_INFO *p = NULL;
 	BOOL need_clear = FALSE;
@@ -856,7 +856,7 @@ bus_responder(CONTROLVM_ID cmdId, ulong busNo, int response)
 }
 
 static void
-device_changestate_responder(CONTROLVM_ID cmdId,
+device_changestate_responder(enum control_vm_id cmdId,
 			     ulong busNo, ulong devNo, int response,
 			     struct ultra_segment_state responseState)
 {
@@ -893,7 +893,7 @@ device_changestate_responder(CONTROLVM_ID cmdId,
 }
 
 static void
-device_responder(CONTROLVM_ID cmdId, ulong busNo, ulong devNo, int response)
+device_responder(enum control_vm_id cmdId, ulong busNo, ulong devNo, int response)
 {
 	VISORCHIPSET_DEVICE_INFO *p = NULL;
 	BOOL need_clear = FALSE;