staging: vc04_services: fix CamelCase

This fixes the CamelCase of some variables.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index c58f5cb16318a44bdc1e0fbe08df3d131f40bb43..f3e10004a3682e74fce4ffe59fa830deb643d196 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -3827,26 +3827,26 @@ VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state)
        return status;
 }
 
-void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
-       size_t numBytes)
+void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *void_mem,
+       size_t num_bytes)
 {
-       const uint8_t  *mem = (const uint8_t *)voidMem;
+       const uint8_t  *mem = (const uint8_t *)void_mem;
        size_t          offset;
-       char            lineBuf[100];
+       char            line_buf[100];
        char           *s;
 
-       while (numBytes > 0) {
-               s = lineBuf;
+       while (num_bytes > 0) {
+               s = line_buf;
 
                for (offset = 0; offset < 16; offset++) {
-                       if (offset < numBytes)
+                       if (offset < num_bytes)
                                s += snprintf(s, 4, "%02x ", mem[offset]);
                        else
                                s += snprintf(s, 4, "   ");
                }
 
                for (offset = 0; offset < 16; offset++) {
-                       if (offset < numBytes) {
+                       if (offset < num_bytes) {
                                uint8_t ch = mem[offset];
 
                                if ((ch < ' ') || (ch > '~'))
@@ -3858,16 +3858,16 @@ void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
 
                if ((label != NULL) && (*label != '\0'))
                        vchiq_log_trace(VCHIQ_LOG_TRACE,
-                               "%s: %08x: %s", label, addr, lineBuf);
+                               "%s: %08x: %s", label, addr, line_buf);
                else
                        vchiq_log_trace(VCHIQ_LOG_TRACE,
-                               "%08x: %s", addr, lineBuf);
+                               "%08x: %s", addr, line_buf);
 
                addr += 16;
                mem += 16;
-               if (numBytes > 16)
-                       numBytes -= 16;
+               if (num_bytes > 16)
+                       num_bytes -= 16;
                else
-                       numBytes = 0;
+                       num_bytes = 0;
        }
 }

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
index 563642c8664fcdf9466a503508c669af45ec387d..14bd2857e46296be215948e70fd87941b63b2dad 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
@@ -70,7 +70,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 *
 ***************************************************************************/
 #define VCHIQ_INIT_RETRIES 10
-VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut)
+VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {
        VCHIQ_STATUS_T status = VCHIQ_ERROR;
        VCHIQ_STATE_T *state;
@@ -108,7 +108,7 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut)
        mutex_init(&instance->bulk_waiter_list_mutex);
        INIT_LIST_HEAD(&instance->bulk_waiter_list);
 
-       *instanceOut = instance;
+       *instance_out = instance;
 
        status = VCHIQ_SUCCESS;
 

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
index d02e7764bd0d8721453d2e0a4900c26c12634c8b..dd43458f306fe6ba6f583abf9eeadffd5b2cfedb 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
@@ -42,13 +42,13 @@
 /* ---- Constants and Types ---------------------------------------------- */
 
 typedef struct {
-        void                   *armSharedMemVirt;
-        dma_addr_t              armSharedMemPhys;
-        size_t                  armSharedMemSize;
+        void                   *arm_shared_mem_virt;
+        dma_addr_t              arm_shared_mem_phys;
+        size_t                  arm_shared_mem_size;
 
-        void                   *vcSharedMemVirt;
-        dma_addr_t              vcSharedMemPhys;
-        size_t                  vcSharedMemSize;
+        void                   *vc_shared_mem_virt;
+        dma_addr_t              vc_shared_mem_phys;
+        size_t                  vc_shared_mem_size;
 } VCHIQ_SHARED_MEM_INFO_T;
 
 /* ---- Variable Externs ------------------------------------------------- */