Commit d3ad6e69 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman

staging: unisys: visorbus: renamed enum in controlvmchannel.h to match driver namespace

Renamed enum and its members
* ultra_chipset_feature to visor_chipset_feature
* ULTRA_CHIPSET_FEATURE_REPLY to VISOR_CHIPSET_FEATURE_REPLY
* ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG to
		VISOR_CHIPSET_FEATURE_PARA_HOTPLUG
Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 545f0913
...@@ -157,9 +157,9 @@ struct efi_visor_indication { ...@@ -157,9 +157,9 @@ struct efi_visor_indication {
u64 reserved:60; /* Natural alignment */ u64 reserved:60; /* Natural alignment */
} __packed; } __packed;
enum ultra_chipset_feature { enum visor_chipset_feature {
ULTRA_CHIPSET_FEATURE_REPLY = 0x00000001, VISOR_CHIPSET_FEATURE_REPLY = 0x00000001,
ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG = 0x00000002, VISOR_CHIPSET_FEATURE_PARA_HOTPLUG = 0x00000002,
}; };
/* This is the common structure that is at the beginning of every /* This is the common structure that is at the beginning of every
...@@ -325,7 +325,7 @@ struct controlvm_message_packet { ...@@ -325,7 +325,7 @@ struct controlvm_message_packet {
u32 bus_count; u32 bus_count;
/* indicates the max number of switches */ /* indicates the max number of switches */
u32 switch_count; u32 switch_count;
enum ultra_chipset_feature features; enum visor_chipset_feature features;
u32 platform_number; /* Platform Number */ u32 platform_number; /* Platform Number */
} __packed init_chipset; /* for CONTROLVM_CHIPSET_INIT */ } __packed init_chipset; /* for CONTROLVM_CHIPSET_INIT */
struct { struct {
......
...@@ -395,7 +395,7 @@ controlvm_init_response(struct controlvm_message *msg, ...@@ -395,7 +395,7 @@ controlvm_init_response(struct controlvm_message *msg,
static int static int
controlvm_respond_chipset_init(struct controlvm_message_header *msg_hdr, controlvm_respond_chipset_init(struct controlvm_message_header *msg_hdr,
int response, int response,
enum ultra_chipset_feature features) enum visor_chipset_feature features)
{ {
struct controlvm_message outmsg; struct controlvm_message outmsg;
...@@ -409,7 +409,7 @@ static int ...@@ -409,7 +409,7 @@ static int
chipset_init(struct controlvm_message *inmsg) chipset_init(struct controlvm_message *inmsg)
{ {
static int chipset_inited; static int chipset_inited;
enum ultra_chipset_feature features = 0; enum visor_chipset_feature features = 0;
int rc = CONTROLVM_RESP_SUCCESS; int rc = CONTROLVM_RESP_SUCCESS;
int res = 0; int res = 0;
...@@ -425,13 +425,13 @@ chipset_init(struct controlvm_message *inmsg) ...@@ -425,13 +425,13 @@ chipset_init(struct controlvm_message *inmsg)
* also supports it). * also supports it).
*/ */
features = inmsg->cmd.init_chipset.features & features = inmsg->cmd.init_chipset.features &
ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG; VISOR_CHIPSET_FEATURE_PARA_HOTPLUG;
/* /*
* Set the "reply" bit so Command knows this is a * Set the "reply" bit so Command knows this is a
* features-aware driver. * features-aware driver.
*/ */
features |= ULTRA_CHIPSET_FEATURE_REPLY; features |= VISOR_CHIPSET_FEATURE_REPLY;
out_respond: out_respond:
if (inmsg->hdr.flags.response_expected) if (inmsg->hdr.flags.response_expected)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment