Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5a28902 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

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



Renamed #defines
* SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID to
		VISOR_CONTROLVM_CHANNEL_UUID
* ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_CONTROLVM_CHANNEL_SIGNATURE
* ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID to
		VISOR_CONTROLVM_CHANNEL_VERSIONID
* SPAR_CONTROLVM_CHANNEL_OK_CLIENT to
		VISOR_CONTROLVM_CHANNEL_OK_CLIENT

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 a27ded92

drivers/staging/unisys/visorbus/controlvmchannel.h

+9 −10
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ 
#include "channel.h"



/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */

#define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID \

#define VISOR_CONTROLVM_CHANNEL_UUID \

	UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \

		0xb9, 0x66, 0x34, 0x48, 0xb7, 0x38, 0x6b, 0x3d)



#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE \

	ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define VISOR_CONTROLVM_CHANNEL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define CONTROLVM_MESSAGE_MAX 64



/* Must increment this whenever you insert or delete fields within
@@ -33,15 +32,15 @@ 
 * software.  Note that you can usually add fields to the END of the

 * channel struct withOUT needing to increment this.

 */

#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID 1

#define VISOR_CONTROLVM_CHANNEL_VERSIONID 1



#define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \

#define VISOR_CONTROLVM_CHANNEL_OK_CLIENT(ch) \

	(spar_check_channel(ch, \

			    SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID, \

			    VISOR_CONTROLVM_CHANNEL_UUID, \

			    "controlvm", \

			    sizeof(struct spar_controlvm_channel_protocol), \

			    ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \

			    ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE))

			    VISOR_CONTROLVM_CHANNEL_VERSIONID, \

			    VISOR_CONTROLVM_CHANNEL_SIGNATURE))



/* Defines for various channel queues */

#define CONTROLVM_QUEUE_REQUEST	 0
@@ -371,7 +370,7 @@ struct spar_controlvm_channel_protocol { 
	u32 message_count;		/* CONTROLVM_MESSAGE_MAX */

	u64 gp_smbios_table;		/* guest phys addr of SMBIOS tables */

	u64 gp_physical_smbios_table;	/* guest phys addr of SMBIOS table  */

	/* ULTRA_MAX_GUESTS_PER_SERVICE */

	/* VISOR_MAX_GUESTS_PER_SERVICE */

	char gp_reserved[2688];



	/* guest physical address of EFI firmware image base  */
@@ -402,7 +401,7 @@ struct spar_controlvm_channel_protocol { 
	u32 installation_text_id;	/* Id of string to display */

	/* Number of remaining installation  steps (for progress bars) */

	u16 installation_remaining_steps;

	/* ULTRA_TOOL_ACTIONS Installation Action field */

	/* VISOR_TOOL_ACTIONS Installation Action field */

	u8 tool_action;

	u8 reserved;		/* alignment */

	struct efi_spar_indication efi_spar_ind;

drivers/staging/unisys/visorbus/visorchipset.c

+8 −8
Original line number Diff line number Diff line
@@ -1179,15 +1179,15 @@ parahotplug_request_kickoff(struct parahotplug_request *req) 
		env_cmd, env_id, env_state, env_bus, env_dev, env_func, NULL

	};



	sprintf(env_cmd, "SPAR_PARAHOTPLUG=1");

	sprintf(env_id, "SPAR_PARAHOTPLUG_ID=%d", req->id);

	sprintf(env_state, "SPAR_PARAHOTPLUG_STATE=%d",

	sprintf(env_cmd, "VISOR_PARAHOTPLUG=1");

	sprintf(env_id, "VISOR_PARAHOTPLUG_ID=%d", req->id);

	sprintf(env_state, "VISOR_PARAHOTPLUG_STATE=%d",

		cmd->device_change_state.state.active);

	sprintf(env_bus, "SPAR_PARAHOTPLUG_BUS=%d",

	sprintf(env_bus, "VISOR_PARAHOTPLUG_BUS=%d",

		cmd->device_change_state.bus_no);

	sprintf(env_dev, "SPAR_PARAHOTPLUG_DEVICE=%d",

	sprintf(env_dev, "VISOR_PARAHOTPLUG_DEVICE=%d",

		cmd->device_change_state.dev_no >> 3);

	sprintf(env_func, "SPAR_PARAHOTPLUG_FUNCTION=%d",

	sprintf(env_func, "VISOR_PARAHOTPLUG_FUNCTION=%d",

		cmd->device_change_state.dev_no & 0x7);



	return kobject_uevent_env(&chipset_dev->acpi_device->dev.kobj,
@@ -1820,7 +1820,7 @@ visorchipset_init(struct acpi_device *acpi_device) 
{

	int err = -ENODEV;

	u64 addr;

	uuid_le uuid = SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID;

	uuid_le uuid = VISOR_CONTROLVM_CHANNEL_UUID;

	struct visorchannel *controlvm_channel;



	chipset_dev = kzalloc(sizeof(*chipset_dev), GFP_KERNEL);
@@ -1848,7 +1848,7 @@ visorchipset_init(struct acpi_device *acpi_device) 
	if (err < 0)

		goto error_destroy_channel;



	if (!SPAR_CONTROLVM_CHANNEL_OK_CLIENT(

	if (!VISOR_CONTROLVM_CHANNEL_OK_CLIENT(

				visorchannel_get_header(controlvm_channel)))

		goto error_delete_groups;