From af96e9c058ff620b78292945e24a9d044b0d6f97 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Sat, 2 Aug 2014 22:03:40 -0400 Subject: [PATCH] staging: unisys: remove GUEST_PHYSICAL_ADDRESS from commontypes.h The typedef for GUEST_PHYSICAL address is only used in two files, so remove it from commontypes.h and add it to visorchipset/file.c and controlvmchannel.h. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../unisys/common-spar/include/channels/controlvmchannel.h | 3 +++ drivers/staging/unisys/include/commontypes.h | 2 -- drivers/staging/unisys/visorchipset/file.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h index 153f57ce908f..7cdce23d0533 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h @@ -20,6 +20,9 @@ #include "commontypes.h" #include "channel.h" #include "controlframework.h" + +typedef u64 GUEST_PHYSICAL_ADDRESS; + enum { INVALID_GUEST_FIRMWARE, SAMPLE_GUEST_FIRMWARE, TIANO32_GUEST_FIRMWARE, TIANO64_GUEST_FIRMWARE }; diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h index 2301984cde7d..fab0c58f8a76 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -25,8 +25,6 @@ #include #include -typedef u64 GUEST_PHYSICAL_ADDRESS; - #define OFFSETOF offsetof #define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \ diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index bf2e546d76bf..2f26de2fa8a4 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -28,6 +28,8 @@ #define CURRENT_FILE_PC VISOR_CHIPSET_PC_file_c +typedef u64 GUEST_PHYSICAL_ADDRESS; + static struct cdev Cdev; static VISORCHANNEL **PControlVm_channel; static dev_t MajorDev = -1; /**< indicates major num for device */