Fixed camel cases in the struct parser_init_guts and an Away camel
case in parser_param_start
isLocal => is_local
tryAgain => try_again
HasStandardPayloadHeader => has_standard_payload_header
Away => cleanups
Signed-off-by: Jeffrey Brown <jeffrey.br...@unisys.com>
---
drivers/staging/unisys/visorchipset/parser.c | 46 ++++++++++++++--------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/unisys/visorchipset/parser.c
b/drivers/staging/unisys/visorchipset/parser.c
index 88abbeb..02cacec 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -41,8 +41,8 @@ struct parser_context_tag {
};
static struct parser_context_tag *
-parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
- BOOL hasStandardPayloadHeader, BOOL *tryAgain)
+parser_init_guts(u64 addr, u32 bytes, BOOL is_local,
+ BOOL has_standard_payload_header, BOOL *try_again)
{
int allocbytes = sizeof(struct parser_context_tag) + bytes;
struct parser_context_tag *rc = NULL;
@@ -50,9 +50,9 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
struct memregion *rgn = NULL;
struct spar_controlvm_parameters_header *phdr = NULL;
- if (tryAgain)
- *tryAgain = FALSE;
- if (!hasStandardPayloadHeader)
+ if (try_again)
+ *try_again = FALSE;
+ if (!has_standard_payload_header)
/* alloc and 0 extra byte to ensure payload is
* '\0'-terminated
*/
@@ -62,19 +62,19 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
ERRDRV("%s (%s:%d) - prevented allocation of %d bytes to
prevent exceeding throttling max (%d)",
__func__, __FILE__, __LINE__, allocbytes,
MAX_CONTROLVM_PAYLOAD_BYTES);
- if (tryAgain)
- *tryAgain = TRUE;
+ if (try_again)
+ *try_again = TRUE;
rc = NULL;
- goto Away;
+ goto cleanups;
}
ctx = kzalloc(allocbytes, GFP_KERNEL|__GFP_NORETRY);
if (ctx == NULL) {
ERRDRV("%s (%s:%d) - failed to allocate %d bytes",
__func__, __FILE__, __LINE__, allocbytes);
- if (tryAgain)
- *tryAgain = TRUE;
+ if (try_again)
+ *try_again = TRUE;
rc = NULL;
- goto Away;
+ goto cleanups;
}
ctx->allocbytes = allocbytes;
@@ -82,7 +82,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
ctx->curr = NULL;
ctx->bytes_remaining = 0;
ctx->byte_stream = FALSE;
- if (isLocal) {
+ if (is_local) {
void *p;
if (addr > virt_to_phys(high_memory - 1)) {
@@ -90,7 +90,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
__func__,
(unsigned long long) addr, (ulong) bytes);
rc = NULL;
- goto Away;
+ goto cleanups;
}
p = __va((ulong) (addr));
memcpy(ctx->data, p, bytes);
@@ -98,17 +98,17 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
rgn = visor_memregion_create(addr, bytes);
if (!rgn) {
rc = NULL;
- goto Away;
+ goto cleanups;
}
if (visor_memregion_read(rgn, 0, ctx->data, bytes) < 0) {
rc = NULL;
- goto Away;
+ goto cleanups;
}
}
- if (!hasStandardPayloadHeader) {
+ if (!has_standard_payload_header) {
ctx->byte_stream = TRUE;
rc = ctx;
- goto Away;
+ goto cleanups;
}
phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
if (phdr->total_length != bytes) {
@@ -116,7 +116,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
__func__,
(ulong) (phdr->total_length), (ulong) (bytes));
rc = NULL;
- goto Away;
+ goto cleanups;
}
if (phdr->total_length < phdr->header_length) {
ERRDRV("%s - total length < header length (%lu < %lu)",
@@ -124,7 +124,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
(ulong) (phdr->total_length),
(ulong) (phdr->header_length));
rc = NULL;
- goto Away;
+ goto cleanups;
}
if (phdr->header_length <
sizeof(struct spar_controlvm_parameters_header)) {
@@ -134,11 +134,11 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
(ulong)(sizeof(
struct spar_controlvm_parameters_header)));
rc = NULL;
- goto Away;
+ goto cleanups;
}
rc = ctx;
-Away:
+cleanups:
if (rgn) {
visor_memregion_destroy(rgn);
rgn = NULL;
@@ -218,7 +218,7 @@ parser_param_start(struct parser_context_tag *ctx,
if (ctx == NULL) {
ERRDRV("%s (%s:%d) - no context",
__func__, __FILE__, __LINE__);
- goto Away;
+ goto cleanups;
}
phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
switch (which_string) {
@@ -243,7 +243,7 @@ parser_param_start(struct parser_context_tag *ctx,
break;
}
-Away:
+cleanups:
return;
}
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
