From 2c683cde06c1d57a9ecbacc484540e259e7255fa Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Fri, 31 Oct 2014 09:57:22 -0400 Subject: [PATCH] staging: unisys: refactor CRASH_OBJ_TYPE Remove the typedef from the enumeration and replace references to it with enum crash_obj_type. Fix CamelCase names: CRASH_dev => CRASH_DEV CRASH_bus => CRASH_BUS Update all references to changed names. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorchipset/visorchipset.h | 10 +++++----- .../staging/unisys/visorchipset/visorchipset_main.c | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index 6ca6580583b5..75f20f068225 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -53,10 +53,10 @@ enum visorchipset_addresstype { ADDRTYPE_LOCALTEST, }; -typedef enum { - CRASH_dev, - CRASH_bus, -} CRASH_OBJ_TYPE; +enum crash_obj_type { + CRASH_DEV, + CRASH_BUS, +}; /** Attributes for a particular Supervisor channel. */ @@ -288,7 +288,7 @@ int visorchipset_chipset_notready(void); void visorchipset_controlvm_respond_reportEvent(struct controlvm_message *msg, void *payload); void visorchipset_save_message(struct controlvm_message *msg, - CRASH_OBJ_TYPE type); + enum crash_obj_type type); void *visorchipset_cache_alloc(struct kmem_cache *pool, BOOL ok_to_block, char *fn, int ln); void visorchipset_cache_free(struct kmem_cache *pool, void *p, diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 70a54899fca6..229c75881c5a 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -760,7 +760,8 @@ static void controlvm_respond_physdev_changestate( } void -visorchipset_save_message(struct controlvm_message *msg, CRASH_OBJ_TYPE type) +visorchipset_save_message(struct controlvm_message *msg, + enum crash_obj_type type) { u32 localSavedCrashMsgOffset; u16 localSavedCrashMsgCount; @@ -796,7 +797,7 @@ visorchipset_save_message(struct controlvm_message *msg, CRASH_OBJ_TYPE type) return; } - if (type == CRASH_bus) { + if (type == CRASH_BUS) { if (visorchannel_write(ControlVm_channel, localSavedCrashMsgOffset, msg, -- 2.20.1