From be408256b06ccb15bafc0367f486969328a91e22 Mon Sep 17 00:00:00 2001 From: Bryan Thompson Date: Fri, 5 Dec 2014 17:09:22 -0500 Subject: [PATCH] staging: unisys: visorchannel: Rename CamelCase variable channelBytes Rename channelBytes to channel_bytes in the series of visorchannel_create functions provided by visorchannel. Signed-off-by: Bryan Thompson Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorchannel/visorchannel.h | 10 ++++----- .../unisys/visorchannel/visorchannel_funcs.c | 26 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h index 5061edf..5dbfddb 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel.h +++ b/drivers/staging/unisys/visorchannel/visorchannel.h @@ -35,17 +35,17 @@ typedef struct VISORCHANNEL_Tag VISORCHANNEL; /* Note that for visorchannel_create() and visorchannel_create_overlapped(), - * and arguments may be 0 if we are a channel CLIENT. + * and arguments may be 0 if we are a channel CLIENT. * In this case, the values can simply be read from the channel header. */ VISORCHANNEL *visorchannel_create(HOSTADDRESS physaddr, - ulong channelBytes, uuid_le guid); -VISORCHANNEL *visorchannel_create_overlapped(ulong channelBytes, + ulong channel_bytes, uuid_le guid); +VISORCHANNEL *visorchannel_create_overlapped(ulong channel_bytes, VISORCHANNEL *parent, ulong off, uuid_le guid); VISORCHANNEL *visorchannel_create_with_lock(HOSTADDRESS physaddr, - ulong channelBytes, uuid_le guid); -VISORCHANNEL *visorchannel_create_overlapped_with_lock(ulong channelBytes, + ulong channel_bytes, uuid_le guid); +VISORCHANNEL *visorchannel_create_overlapped_with_lock(ulong channel_bytes, VISORCHANNEL *parent, ulong off, uuid_le guid); void visorchannel_destroy(VISORCHANNEL *channel); diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c index 36559d5..6601b3e 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c +++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c @@ -49,7 +49,7 @@ struct VISORCHANNEL_Tag { * NOT modify this data area. */ static VISORCHANNEL * -visorchannel_create_guts(HOSTADDRESS physaddr, ulong channelBytes, +visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, VISORCHANNEL *parent, ulong off, uuid_le guid, BOOL needs_lock) { @@ -87,18 +87,18 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channelBytes, rc = NULL; goto cleanup; } - if (channelBytes == 0) + if (channel_bytes == 0) /* we had better be a CLIENT of this channel */ - channelBytes = (ulong)p->chan_hdr.size; + channel_bytes = (ulong)p->chan_hdr.size; if (uuid_le_cmp(guid, NULL_UUID_LE) == 0) /* we had better be a CLIENT of this channel */ guid = p->chan_hdr.chtype; - if (visor_memregion_resize(p->memregion, channelBytes) < 0) { + if (visor_memregion_resize(p->memregion, channel_bytes) < 0) { ERRDRV("visor_memregion_resize failed: (status=0)\n"); rc = NULL; goto cleanup; } - p->size = channelBytes; + p->size = channel_bytes; p->guid = guid; rc = p; @@ -114,37 +114,37 @@ cleanup: } VISORCHANNEL * -visorchannel_create(HOSTADDRESS physaddr, ulong channelBytes, uuid_le guid) +visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid) { - return visorchannel_create_guts(physaddr, channelBytes, NULL, 0, guid, + return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid, FALSE); } EXPORT_SYMBOL_GPL(visorchannel_create); VISORCHANNEL * -visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channelBytes, +visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid) { - return visorchannel_create_guts(physaddr, channelBytes, NULL, 0, guid, + return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid, TRUE); } EXPORT_SYMBOL_GPL(visorchannel_create_with_lock); VISORCHANNEL * -visorchannel_create_overlapped(ulong channelBytes, +visorchannel_create_overlapped(ulong channel_bytes, VISORCHANNEL *parent, ulong off, uuid_le guid) { - return visorchannel_create_guts(0, channelBytes, parent, off, guid, + return visorchannel_create_guts(0, channel_bytes, parent, off, guid, FALSE); } EXPORT_SYMBOL_GPL(visorchannel_create_overlapped); VISORCHANNEL * -visorchannel_create_overlapped_with_lock(ulong channelBytes, +visorchannel_create_overlapped_with_lock(ulong channel_bytes, VISORCHANNEL *parent, ulong off, uuid_le guid) { - return visorchannel_create_guts(0, channelBytes, parent, off, guid, + return visorchannel_create_guts(0, channel_bytes, parent, off, guid, TRUE); } EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock); -- 2.7.4