Commit 8800bfbc authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: fix CamelCase in PathName_Last_N_Nodes()

Fix CamelCase name:

PathName_Last_N_Nodes => pathname_last_n_nodes
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13d58a98
...@@ -124,7 +124,7 @@ ULTRA_CHANNELCLI_STRING(u32 v) ...@@ -124,7 +124,7 @@ ULTRA_CHANNELCLI_STRING(u32 v)
old, \ old, \
ULTRA_CHANNELCLI_STRING(new), \ ULTRA_CHANNELCLI_STRING(new), \
new, \ new, \
PathName_Last_N_Nodes((u8 *)file, 4), \ pathname_last_n_nodes((u8 *)file, 4), \
line); \ line); \
} while (0) } while (0)
...@@ -145,7 +145,7 @@ ULTRA_CHANNELCLI_STRING(u32 v) ...@@ -145,7 +145,7 @@ ULTRA_CHANNELCLI_STRING(u32 v)
(pChan))->cli_state_os), \ (pChan))->cli_state_os), \
ULTRA_CHANNELCLI_STRING(newstate), \ ULTRA_CHANNELCLI_STRING(newstate), \
newstate, \ newstate, \
PathName_Last_N_Nodes(__FILE__, 4), __LINE__); \ pathname_last_n_nodes(__FILE__, 4), __LINE__); \
writel(newstate, &((struct channel_header __iomem *) \ writel(newstate, &((struct channel_header __iomem *) \
(pChan))->cli_state_os); \ (pChan))->cli_state_os); \
mb(); /* required for channel synch */ \ mb(); /* required for channel synch */ \
...@@ -389,7 +389,7 @@ ULTRA_check_channel_server(uuid_le typeGuid, ...@@ -389,7 +389,7 @@ ULTRA_check_channel_server(uuid_le typeGuid,
* in it, the return pointer will be to the beginning of the string. * in it, the return pointer will be to the beginning of the string.
*/ */
static inline u8 * static inline u8 *
PathName_Last_N_Nodes(u8 *s, unsigned int n) pathname_last_n_nodes(u8 *s, unsigned int n)
{ {
u8 *p = s; u8 *p = s;
unsigned int node_count = 0; unsigned int node_count = 0;
...@@ -429,7 +429,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -429,7 +429,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
/* throttle until acquire successful */ /* throttle until acquire successful */
pr_info("%s Channel StateTransition INVALID! - acquire failed because OS client DISABLED @%s:%d\n", 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); line);
} }
return 0; return 0;
...@@ -443,7 +443,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -443,7 +443,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
readl(&pChan->cli_state_os), readl(&pChan->cli_state_os),
ULTRA_CHANNELCLI_STRING(CHANNELCLI_OWNED), ULTRA_CHANNELCLI_STRING(CHANNELCLI_OWNED),
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); writel(CHANNELCLI_OWNED, &pChan->cli_state_os);
mb(); /* required for channel synch */ mb(); /* required for channel synch */
} }
...@@ -452,7 +452,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -452,7 +452,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
/* we are in an error msg throttling state; /* we are in an error msg throttling state;
* come out of it */ * come out of it */
pr_info("%s Channel OS client acquire now successful @%s:%d\n", 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); line);
writeb(0, &pChan->cli_error_os); writeb(0, &pChan->cli_error_os);
} }
...@@ -474,7 +474,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -474,7 +474,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
chanId, ULTRA_CHANNELCLI_STRING( chanId, ULTRA_CHANNELCLI_STRING(
readl(&pChan->cli_state_os)), readl(&pChan->cli_state_os)),
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); line);
} }
return 0; return 0;
...@@ -490,7 +490,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -490,7 +490,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
&pChan->cli_error_os); &pChan->cli_error_os);
/* throttle until acquire successful */ /* throttle until acquire successful */
pr_info("%s Channel StateTransition failed - host OS acquire failed because boot BUSY @%s:%d\n", 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); line);
} }
/* reset busy */ /* reset busy */
...@@ -501,7 +501,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId, ...@@ -501,7 +501,7 @@ ULTRA_channel_client_acquire_os(void __iomem *pChannel, u8 *chanId,
if (readb(&pChan->cli_error_os) != 0) { if (readb(&pChan->cli_error_os) != 0) {
/* we are in an error msg throttling state; come out of it */ /* we are in an error msg throttling state; come out of it */
pr_info("%s Channel OS client acquire now successful @%s:%d\n", 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); line);
writeb(0, &pChan->cli_error_os); writeb(0, &pChan->cli_error_os);
} }
...@@ -517,7 +517,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId, ...@@ -517,7 +517,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
if (readb(&pChan->cli_error_os) != 0) { if (readb(&pChan->cli_error_os) != 0) {
/* we are in an error msg throttling state; come out of it */ /* we are in an error msg throttling state; come out of it */
pr_info("%s Channel OS client error state cleared @%s:%d\n", 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); line);
writeb(0, &pChan->cli_error_os); writeb(0, &pChan->cli_error_os);
} }
...@@ -528,7 +528,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId, ...@@ -528,7 +528,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
chanId, ULTRA_CHANNELCLI_STRING( chanId, ULTRA_CHANNELCLI_STRING(
readl(&pChan->cli_state_os)), readl(&pChan->cli_state_os)),
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; */ /* return; */
} }
writel(CHANNELCLI_ATTACHED, &pChan->cli_state_os); /* release busy */ writel(CHANNELCLI_ATTACHED, &pChan->cli_state_os); /* release busy */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment