[PATCH 58/91] staging: unisys: refactor UltraDiagChannelProtocolGuid

Benjamin Romer benjamin.romer at unisys.com
Thu Oct 23 18:30:37 UTC 2014


Fix the CamelCase name:

UltraDiagChannelProtocolGuid => spar_diag_channel_protocol_uuid

Also, rename ULTRA_DIAG_CHANNEL_PROTOCOL_GUID to SPAR_DIAG_CHANNEL_PROTOCOL_UUID
to match the new variable name. Update all references to the changed names.

Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
 .../staging/unisys/common-spar/include/channels/diagchannel.h  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
index 4132642..920dc36 100644
--- a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
@@ -37,12 +37,12 @@
 #include "channel.h"
 
 /* {EEA7A573-DB82-447c-8716-EFBEAAAE4858} */
-#define ULTRA_DIAG_CHANNEL_PROTOCOL_GUID \
+#define SPAR_DIAG_CHANNEL_PROTOCOL_UUID \
 		UUID_LE(0xeea7a573, 0xdb82, 0x447c, \
 				0x87, 0x16, 0xef, 0xbe, 0xaa, 0xae, 0x48, 0x58)
 
-static const uuid_le UltraDiagChannelProtocolGuid =
-	ULTRA_DIAG_CHANNEL_PROTOCOL_GUID;
+static const uuid_le spar_diag_channel_protocol_uuid =
+	SPAR_DIAG_CHANNEL_PROTOCOL_UUID;
 
 /* {E850F968-3263-4484-8CA5-2A35D087A5A8} */
 #define ULTRA_DIAG_ROOT_CHANNEL_PROTOCOL_GUID \
@@ -60,13 +60,13 @@ static const uuid_le UltraDiagChannelProtocolGuid =
 
 #define ULTRA_DIAG_CHANNEL_OK_CLIENT(pChannel, logCtx)			\
 	(spar_check_channel_client(pChannel,				\
-				    UltraDiagChannelProtocolGuid,	\
+				    spar_diag_channel_protocol_uuid,	\
 				    "diag",				\
 				    sizeof(ULTRA_DIAG_CHANNEL_PROTOCOL), \
 				    ULTRA_DIAG_CHANNEL_PROTOCOL_VERSIONID, \
 				    ULTRA_DIAG_CHANNEL_PROTOCOL_SIGNATURE))
 #define ULTRA_DIAG_CHANNEL_OK_SERVER(actualBytes)		\
-	(spar_check_channel_server(UltraDiagChannelProtocolGuid,	\
+	(spar_check_channel_server(spar_diag_channel_protocol_uuid,	\
 				   "diag",				\
 				   sizeof(ULTRA_DIAG_CHANNEL_PROTOCOL), \
 				    actualBytes))
-- 
1.9.1



More information about the devel mailing list