Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48157007 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: vc04_services: fix up some printk warnings 



Some more printk warnings snuck in recently, no one seems to be building
this on 64bit machines...

Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Lee Jones <lee@kernel.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Michael Zoran <mzoran@crowfest.net>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9224c15c

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

+5 −5
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 
				service_quota->slot_quota))) {

			spin_unlock(&quota_spinlock);

			vchiq_log_trace(vchiq_core_log_level,

				"%d: qm:%d %s,%x - quota stall "

				"%d: qm:%d %s,%zx - quota stall "

				"(msg %d, slot %d)",

				state->id, service->localport,

				msg_type_str(type), size,
@@ -896,7 +896,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 
		int slot_use_count;



		vchiq_log_info(vchiq_core_log_level,

			"%d: qm %s@%pK,%x (%d->%d)",

			"%d: qm %s@%pK,%zx (%d->%d)",

			state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)),

			header, size, VCHIQ_MSG_SRCPORT(msgid),

			VCHIQ_MSG_DSTPORT(msgid));
@@ -949,7 +949,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 


		if (slot_use_count)

			vchiq_log_trace(vchiq_core_log_level,

				"%d: qm:%d %s,%x - slot_use->%d (hdr %p)",

				"%d: qm:%d %s,%zx - slot_use->%d (hdr %p)",

				state->id, service->localport,

				msg_type_str(VCHIQ_MSG_TYPE(msgid)), size,

				slot_use_count, header);
@@ -958,7 +958,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 
		VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);

	} else {

		vchiq_log_info(vchiq_core_log_level,

			"%d: qm %s@%pK,%x (%d->%d)", state->id,

			"%d: qm %s@%pK,%zx (%d->%d)", state->id,

			msg_type_str(VCHIQ_MSG_TYPE(msgid)),

			header, size, VCHIQ_MSG_SRCPORT(msgid),

			VCHIQ_MSG_DSTPORT(msgid));
@@ -989,7 +989,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 
			: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');



		vchiq_log_info(SRVTRACE_LEVEL(service),

			"Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d",

			"Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%zu",

			msg_type_str(VCHIQ_MSG_TYPE(msgid)),

			VCHIQ_MSG_TYPE(msgid),

			VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),