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

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

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



Renamed #defines:
* SPAR_VBUS_CHANNEL_PROTOCOL_UUID to VISOR_VBUS_CHANNEL_UUID
* SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_VBUS_CHANNEL_SIGNATURE
* SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID to
		VISOR_VBUS_CHANNEL_VERSIONID

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 8b0a6cfa

drivers/staging/unisys/visorbus/vbuschannel.h

+4 −5
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ 
#include "channel.h"



/* {193b331b-c58f-11da-95a9-00e08161165f} */

#define SPAR_VBUS_CHANNEL_PROTOCOL_UUID \

#define VISOR_VBUS_CHANNEL_UUID \

	UUID_LE(0x193b331b, 0xc58f, 0x11da, \

		0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vbus_channel_protocol_uuid =

	SPAR_VBUS_CHANNEL_PROTOCOL_UUID;

static const uuid_le visor_vbus_channel_uuid = VISOR_VBUS_CHANNEL_UUID;



#define SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define VISOR_VBUS_CHANNEL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE



/* Must increment this whenever you insert or delete fields within this channel

 * struct.  Also increment whenever you change the meaning of fields within this
@@ -41,7 +40,7 @@ static const uuid_le spar_vbus_channel_protocol_uuid = 
 * usually add fields to the END of the channel struct withOUT needing to

 * increment this.

 */

#define SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID 1

#define VISOR_VBUS_CHANNEL_VERSIONID 1



/*

 * An array of this struct is present in the channel area for each vbus.

drivers/staging/unisys/visorbus/visorbus_main.c

+3 −3
Original line number Diff line number Diff line
@@ -689,11 +689,11 @@ get_vbus_header_info(struct visorchannel *chan, 
	int err;



	if (!spar_check_channel(visorchannel_get_header(chan),

				spar_vbus_channel_protocol_uuid,

				visor_vbus_channel_uuid,

				"vbus",

				sizeof(struct spar_vbus_channel_protocol),

				SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID,

				SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE))

				VISOR_VBUS_CHANNEL_VERSIONID,

				VISOR_VBUS_CHANNEL_SIGNATURE))

		return -EINVAL;



	err = visorchannel_read(chan, sizeof(struct channel_header), hdr_info,