diff options
| author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-08-03 02:03:40 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 19:23:06 (GMT) |
| commit | af96e9c058ff620b78292945e24a9d044b0d6f97 (patch) | |
| tree | 1074e71e43ea77837584314796eeab24313cea50 | |
| parent | 2046fcca74148b627577c6324c811c7e894fa45d (diff) | |
| download | linux-af96e9c058ff620b78292945e24a9d044b0d6f97.tar.xz | |
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 <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h | 3 | ||||
| -rw-r--r-- | drivers/staging/unisys/include/commontypes.h | 2 | ||||
| -rw-r--r-- | 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 153f57ce..7cdce23 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 2301984..fab0c58 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -25,8 +25,6 @@ #include <linux/io.h> #include <linux/uuid.h> -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 bf2e546..2f26de2 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 */ |