From b9b141e8535f157758ed1f457eb639703a7f2326 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:30:24 -0400 Subject: [PATCH] staging: unisys: refactor ULTRA_CHIPSET_FEATURE enum Get rid of the typedef and use enum ultra_chipset_feature instead, and update all references to the enumeration. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../unisys/common-spar/include/channels/controlvmchannel.h | 6 +++--- drivers/staging/unisys/visorchipset/visorchipset_main.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h index d59dd3545128..20c1506e7e96 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h @@ -158,11 +158,11 @@ struct efi_spar_indication { /* remaining bits are available */ }; -typedef enum { +enum ultra_chipset_feature { ULTRA_CHIPSET_FEATURE_REPLY = 0x00000001, ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG = 0x00000002, ULTRA_CHIPSET_FEATURE_PCIVBUS = 0x00000004 -} ULTRA_CHIPSET_FEATURE; +}; /** This is the common structure that is at the beginning of every * ControlVm message (both commands and responses) in any ControlVm @@ -346,7 +346,7 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { u32 switchCount; /*< indicates the max number of * switches (applicable for service * partition only) */ - ULTRA_CHIPSET_FEATURE features; + enum ultra_chipset_feature features; u32 platformNumber; /* Platform Number */ } initChipset; /* for CONTROLVM_CHIPSET_INIT */ struct { diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 9269e46a2e7e..c8d8d258a7cd 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -347,7 +347,7 @@ static struct platform_device Visorchipset_platform_device = { static void controlvm_respond(CONTROLVM_MESSAGE_HEADER *msgHdr, int response); static void controlvm_respond_chipset_init(CONTROLVM_MESSAGE_HEADER *msgHdr, int response, - ULTRA_CHIPSET_FEATURE features); + enum ultra_chipset_feature features); static void controlvm_respond_physdev_changestate(CONTROLVM_MESSAGE_HEADER * msgHdr, int response, struct spar_segment_state state); @@ -655,7 +655,7 @@ static void chipset_init(CONTROLVM_MESSAGE *inmsg) { static int chipset_inited; - ULTRA_CHIPSET_FEATURE features = 0; + enum ultra_chipset_feature features = 0; int rc = CONTROLVM_RESP_SUCCESS; POSTCODE_LINUX_2(CHIPSET_INIT_ENTRY_PC, POSTCODE_SEVERITY_INFO); @@ -727,7 +727,7 @@ controlvm_respond(CONTROLVM_MESSAGE_HEADER *msgHdr, int response) static void controlvm_respond_chipset_init(CONTROLVM_MESSAGE_HEADER *msgHdr, int response, - ULTRA_CHIPSET_FEATURE features) + enum ultra_chipset_feature features) { CONTROLVM_MESSAGE outmsg; -- 2.30.2