summaryrefslogtreecommitdiffstats
path: root/drivers/staging/unisys/visorbus/visorchipset.c
diff options
context:
space:
mode:
authorSameer Wadgaonkar2017-05-19 22:17:47 +0200
committerGreg Kroah-Hartman2017-05-25 18:53:13 +0200
commita27ded9272c763e598adedd445f9c838265b46c1 (patch)
tree2a56a8022b54b0e8a9d3f875bba588c9732ed6b3 /drivers/staging/unisys/visorbus/visorchipset.c
parentstaging: unisys: visorbus: renamed #define in visorchannel.c to match driver ... (diff)
downloadkernel-qcow2-linux-a27ded9272c763e598adedd445f9c838265b46c1.tar.gz
kernel-qcow2-linux-a27ded9272c763e598adedd445f9c838265b46c1.tar.xz
kernel-qcow2-linux-a27ded9272c763e598adedd445f9c838265b46c1.zip
staging: unisys: visorbus: renamed #defines in visorchipset.c to match driver namespace
Renamed #defines * UNISYS_SPAR_LEAF_ID to UNISYS_VISOR_LEAF_ID * UNISYS_SPAR_ID_EBX to UNISYS_VISOR_ID_EBX * UNISYS_SPAR_ID_ECX to UNISYS_VISOR_ID_ECX * UNISYS_SPAR_ID_EDX to UNISYS_VISOR_ID_EDX Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com> Signed-off-by: David Kershner <david.kershner@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorbus/visorchipset.c')
-rw-r--r--drivers/staging/unisys/visorbus/visorchipset.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 630dd05e1460..971ad9a2fe6f 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -34,12 +34,12 @@
#define MAX_CONTROLVM_PAYLOAD_BYTES (1024 * 128)
-#define UNISYS_SPAR_LEAF_ID 0x40000000
+#define UNISYS_VISOR_LEAF_ID 0x40000000
/* The s-Par leaf ID returns "UnisysSpar64" encoded across ebx, ecx, edx */
-#define UNISYS_SPAR_ID_EBX 0x73696e55
-#define UNISYS_SPAR_ID_ECX 0x70537379
-#define UNISYS_SPAR_ID_EDX 0x34367261
+#define UNISYS_VISOR_ID_EBX 0x73696e55
+#define UNISYS_VISOR_ID_ECX 0x70537379
+#define UNISYS_VISOR_ID_EDX 0x34367261
/*
* When the controlvm channel is idle for at least MIN_IDLE_SECONDS,
@@ -1927,10 +1927,10 @@ static __init int visorutil_spar_detect(void)
if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
/* check the ID */
- cpuid(UNISYS_SPAR_LEAF_ID, &eax, &ebx, &ecx, &edx);
- return (ebx == UNISYS_SPAR_ID_EBX) &&
- (ecx == UNISYS_SPAR_ID_ECX) &&
- (edx == UNISYS_SPAR_ID_EDX);
+ cpuid(UNISYS_VISOR_LEAF_ID, &eax, &ebx, &ecx, &edx);
+ return (ebx == UNISYS_VISOR_ID_EBX) &&
+ (ecx == UNISYS_VISOR_ID_ECX) &&
+ (edx == UNISYS_VISOR_ID_EDX);
} else {
return 0;
}