From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Fri, 3 Oct 2014 18:08:51 +0000 (-0400)
Subject: staging: unisys: fix CamelCase in struct req_handler_info
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=157764e776139ce7996190a3ef44e3b0ee582d82;p=linux-beck.git

staging: unisys: fix CamelCase in struct req_handler_info

Fix CamelCase names:
switchTypeGuid => switch_uuid
Server_Channel_Ok => server_channel_ok
channelBytes => channel_bytes
Server_Channel_Init => server_channel_init
clientStr => client_str
clientStrLen => client_str_len

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 9bb95d597d5c..992c8cdfb725 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -55,12 +55,12 @@ extern int (*virt_control_chan_func)(struct guest_msgs *);
 extern atomic_t uisutils_registered_services;
 
 struct req_handler_info {
-	uuid_le switchTypeGuid;
+	uuid_le switch_uuid;
 	int (*controlfunc)(struct io_msgs *);
 	unsigned long min_channel_bytes;
-	int (*Server_Channel_Ok)(unsigned long channelBytes);
-	int (*Server_Channel_Init)
-	 (void *x, unsigned char *clientStr, u32 clientStrLen, u64 bytes);
+	int (*server_channel_ok)(unsigned long channel_bytes);
+	int (*server_channel_init)
+	 (void *x, unsigned char *client_str, u32 client_str_len, u64 bytes);
 	char switch_type_name[99];
 	struct list_head list_link;	/* links into ReqHandlerInfo_list */
 };
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index f3a23a62d6fe..7006c470d6ac 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -292,11 +292,11 @@ ReqHandlerAdd(uuid_le switchTypeGuid,
 	rc = kzalloc(sizeof(*rc), GFP_ATOMIC);
 	if (!rc)
 		return NULL;
-	rc->switchTypeGuid = switchTypeGuid;
+	rc->switch_uuid = switchTypeGuid;
 	rc->controlfunc = controlfunc;
 	rc->min_channel_bytes = min_channel_bytes;
-	rc->Server_Channel_Ok = Server_Channel_Ok;
-	rc->Server_Channel_Init = Server_Channel_Init;
+	rc->server_channel_ok = Server_Channel_Ok;
+	rc->server_channel_init = Server_Channel_Init;
 	if (switch_type_name)
 		strncpy(rc->switch_type_name, switch_type_name,
 			sizeof(rc->switch_type_name) - 1);
@@ -316,7 +316,7 @@ ReqHandlerFind(uuid_le switchTypeGuid)
 	spin_lock(&ReqHandlerInfo_list_lock);
 	list_for_each_safe(lelt, tmp, &ReqHandlerInfo_list) {
 		entry = list_entry(lelt, struct req_handler_info, list_link);
-		if (uuid_le_cmp(entry->switchTypeGuid, switchTypeGuid) == 0) {
+		if (uuid_le_cmp(entry->switch_uuid, switchTypeGuid) == 0) {
 			spin_unlock(&ReqHandlerInfo_list_lock);
 			return entry;
 		}
@@ -335,7 +335,7 @@ ReqHandlerDel(uuid_le switchTypeGuid)
 	spin_lock(&ReqHandlerInfo_list_lock);
 	list_for_each_safe(lelt, tmp, &ReqHandlerInfo_list) {
 		entry = list_entry(lelt, struct req_handler_info, list_link);
-		if (uuid_le_cmp(entry->switchTypeGuid, switchTypeGuid) == 0) {
+		if (uuid_le_cmp(entry->switch_uuid, switchTypeGuid) == 0) {
 			list_del(lelt);
 			kfree(entry);
 			rc++;