Commit 801b1aa0 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: fix CamelCase 



This fixes the CamelCase of some variables.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e474d8e

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+13 −13
Original line number Diff line number Diff line
@@ -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;

	}

}

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h

+6 −6
Original line number Diff line number Diff line
@@ -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 ------------------------------------------------- */