aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Romer <benjamin.romer@unisys.com>2015-03-16 13:57:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 21:53:43 +0100
commitb2d97e4be944645137143e19b51af4575950cfc4 (patch)
tree96024f75fe67ce29a588c3bf44aa155a39210b96
parentMerge 4.0-rc5 into staging-testing (diff)
downloadlinux-dev-b2d97e4be944645137143e19b51af4575950cfc4.tar.xz
linux-dev-b2d97e4be944645137143e19b51af4575950cfc4.zip
staging: unisys: refactor parser_init_byteStream
Fix CamelCase names: parser_init_byteStream => parser_init_byte_stream isLocal => local tryAgain => retry Update references to the changed function name. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/unisys/visorchipset/parser.c4
-rw-r--r--drivers/staging/unisys/visorchipset/parser.h4
-rw-r--r--drivers/staging/unisys/visorchipset/visorchipset_main.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index f10b4439f593..29d840c74193 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -146,9 +146,9 @@ parser_init(u64 addr, u32 bytes, BOOL local, BOOL *retry)
* parser_byteStream_get() to obtain the data.
*/
struct parser_context *
-parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
+parser_init_byte_stream(u64 addr, u32 bytes, BOOL local, BOOL *retry)
{
- return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain);
+ return parser_init_guts(addr, bytes, local, FALSE, retry);
}
/* Obtain '\0'-terminated copy of string in payload area.
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index aa50ff8780a3..a06772fdb344 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -32,8 +32,8 @@ typedef enum {
struct parser_context *parser_init(u64 addr, u32 bytes, BOOL isLocal,
BOOL *tryAgain);
-struct parser_context *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
- BOOL *tryAgain);
+struct parser_context *parser_init_byte_stream(u64 addr, u32 bytes, BOOL local,
+ BOOL *retry);
void parser_param_start(struct parser_context *ctx,
PARSER_WHICH_STRING which_string);
void *parser_param_get(struct parser_context *ctx, char *nam, int namesize);
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 284ed4f75f61..b1b8c94e0194 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1717,7 +1717,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
BOOL retry = FALSE;
parser_ctx =
- parser_init_byteStream(parametersAddr, parametersBytes,
+ parser_init_byte_stream(parametersAddr, parametersBytes,
isLocalAddr, &retry);
if (!parser_ctx && retry)
return FALSE;