staging: unisys: remove typedef CONTROLVM_ID

Replace the typedef for CONTROLVM_ID with enum controlvm_id, and update
all references to the old typedef.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.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 c168e148a0c1b485a2e4fc56cdd92e00fbc457f1..20e464eb4dde53b47fa1497da5df6790860d6b2a 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -82,7 +82,7 @@ static const uuid_le spar_controlvm_channel_protocol_uuid =
  *  - issued on the EventQueue queue (q #2) in the ControlVm channel
  *  - responded to on the EventAckQueue queue (q #3) in the ControlVm channel
  */
-enum control_vm_id {
+enum controlvm_id {
        CONTROLVM_INVALID = 0,
        /* SWITCH commands required Parameter: SwitchNumber  */
        /* BUS commands required Parameter: BusNumber  */

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index f8ffa0263e2969d540c98f5517f7bd1d67ceeb61..35794eff475ffde566293f600b5e2dfb72bc246d 100644 (file)
--- 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(enum control_vm_id id, CONTROLVM_MESSAGE_PACKET *event);
+int uislib_send_event(enum controlvm_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_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index e84c154a6a6de1b653a3ea0f03e09be1a3c24e81..ed26c29ec4b0d6368a7fe4ff1b5e2532c936f69c 100644 (file)
--- 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(enum control_vm_id cmdId, ulong busNo, int response)
+bus_responder(enum controlvm_id cmdId, ulong busNo, int response)
 {
        VISORCHIPSET_BUS_INFO *p = NULL;
        BOOL need_clear = FALSE;
@@ -856,7 +856,7 @@ bus_responder(enum control_vm_id cmdId, ulong busNo, int response)
 }
 
 static void
-device_changestate_responder(enum control_vm_id cmdId,
+device_changestate_responder(enum controlvm_id cmdId,
                             ulong busNo, ulong devNo, int response,
                             struct spar_segment_state responseState)
 {
@@ -893,7 +893,8 @@ device_changestate_responder(enum control_vm_id cmdId,
 }
 
 static void
-device_responder(enum control_vm_id cmdId, ulong busNo, ulong devNo, int response)
+device_responder(enum controlvm_id cmdId, ulong busNo, ulong devNo,
+                int response)
 {
        VISORCHIPSET_DEVICE_INFO *p = NULL;
        BOOL need_clear = FALSE;