From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Thu, 23 Oct 2014 18:29:59 +0000 (-0400)
Subject: staging: unisys: fix CamelCase in PathName_Last_N_Nodes()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8800bfbc068352104efa11efb73424217427f9da;p=linux-beck.git

staging: unisys: fix CamelCase in PathName_Last_N_Nodes()

Fix CamelCase name:

PathName_Last_N_Nodes => pathname_last_n_nodes

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

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 2ce687e2cd31..c68d36cf5d48 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -124,7 +124,7 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 				old,				\
 				ULTRA_CHANNELCLI_STRING(new),	\
 				new,				\
-				PathName_Last_N_Nodes((u8 *)file, 4), \
+				pathname_last_n_nodes((u8 *)file, 4), \
 				line);				\
 	} while (0)
 
@@ -145,7 +145,7 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 				      (pChan))->cli_state_os),		\
 				ULTRA_CHANNELCLI_STRING(newstate),	\
 				newstate,				\
-				PathName_Last_N_Nodes(__FILE__, 4), __LINE__); \
+				pathname_last_n_nodes(__FILE__, 4), __LINE__); \
 		writel(newstate, &((struct channel_header __iomem *) \
 				   (pChan))->cli_state_os);		\
 		mb(); /* required for channel synch */			\
@@ -389,7 +389,7 @@ ULTRA_check_channel_server(uuid_le typeGuid,
  * in it, the return pointer will be to the beginning of the string.
  */
 static inline u8 *
-PathName_Last_N_Nodes(u8 *s, unsigned int n)
+pathname_last_n_nodes(u8 *s, unsigned int n)
 {
 	u8 *p = s;
 	unsigned int node_count = 0;
@@ -429,7 +429,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 			/* throttle until acquire successful */
 
 			pr_info("%s Channel StateTransition INVALID! - acquire failed because OS client DISABLED @%s:%d\n",
-				chanId, PathName_Last_N_Nodes((u8 *) file, 4),
+				chanId, pathname_last_n_nodes((u8 *) file, 4),
 				line);
 		}
 		return 0;
@@ -443,7 +443,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 			readl(&pChan->cli_state_os),
 			ULTRA_CHANNELCLI_STRING(CHANNELCLI_OWNED),
 			CHANNELCLI_OWNED,
-			PathName_Last_N_Nodes((u8 *) file, 4), line);
+			pathname_last_n_nodes((u8 *) file, 4), line);
 		writel(CHANNELCLI_OWNED, &pChan->cli_state_os);
 		mb(); /* required for channel synch */
 	}
@@ -452,7 +452,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 			/* we are in an error msg throttling state;
 			 * come out of it */
 			pr_info("%s Channel OS client acquire now successful @%s:%d\n",
-				chanId, PathName_Last_N_Nodes((u8 *) file, 4),
+				chanId, pathname_last_n_nodes((u8 *) file, 4),
 				line);
 			writeb(0, &pChan->cli_error_os);
 		}
@@ -474,7 +474,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 				chanId, ULTRA_CHANNELCLI_STRING(
 						readl(&pChan->cli_state_os)),
 				readl(&pChan->cli_state_os),
-				PathName_Last_N_Nodes((u8 *) file, 4),
+				pathname_last_n_nodes((u8 *) file, 4),
 				line);
 		}
 		return 0;
@@ -490,7 +490,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 			       &pChan->cli_error_os);
 			/* throttle until acquire successful */
 			pr_info("%s Channel StateTransition failed - host OS acquire failed because boot BUSY @%s:%d\n",
-				chanId, PathName_Last_N_Nodes((u8 *) file, 4),
+				chanId, pathname_last_n_nodes((u8 *) file, 4),
 				line);
 		}
 		/* reset busy */
@@ -501,7 +501,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
 	if (readb(&pChan->cli_error_os) != 0) {
 		/* we are in an error msg throttling state; come out of it */
 		pr_info("%s Channel OS client acquire now successful @%s:%d\n",
-			chanId, PathName_Last_N_Nodes((u8 *) file, 4),
+			chanId, pathname_last_n_nodes((u8 *) file, 4),
 			line);
 		writeb(0, &pChan->cli_error_os);
 	}
@@ -517,7 +517,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
 	if (readb(&pChan->cli_error_os) != 0) {
 		/* we are in an error msg throttling state; come out of it */
 		pr_info("%s Channel OS client error state cleared @%s:%d\n",
-			chanId, PathName_Last_N_Nodes((u8 *) file, 4),
+			chanId, pathname_last_n_nodes((u8 *) file, 4),
 			line);
 		writeb(0, &pChan->cli_error_os);
 	}
@@ -528,7 +528,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
 			chanId, ULTRA_CHANNELCLI_STRING(
 					readl(&pChan->cli_state_os)),
 			readl(&pChan->cli_state_os),
-			PathName_Last_N_Nodes((u8 *) file, 4), line);
+			pathname_last_n_nodes((u8 *) file, 4), line);
 		/* return; */
 	}
 	writel(CHANNELCLI_ATTACHED, &pChan->cli_state_os); /* release busy */