diff options
| author | Etienne Carriere <etienne.carriere@linaro.org> | 2019-03-01 08:24:01 +0100 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2019-03-01 09:16:46 +0100 |
| commit | 65fe41dbdc63557028cea7c43901326cbccc0cb1 (patch) | |
| tree | 4dde0ae75316850bd95d5be30d47f8e21de75aa0 /core/tee | |
| parent | 0e173507dd242fc347b1bf506470fbc70ed600c2 (diff) | |
core: cleanup generic traces
Remove useless newline character in few generic debug traces.
Remove argument __func__ from a FMSG trace since already
output by macro FMSG().
Remove error trace from syscall_storage_obj_read() that, prior
this change, output failing error code from storage read()
handler. This is useless and not done for other storage handlers
return code.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Diffstat (limited to 'core/tee')
| -rw-r--r-- | core/tee/tee_obj.c | 2 | ||||
| -rw-r--r-- | core/tee/tee_rpmb_fs.c | 2 | ||||
| -rw-r--r-- | core/tee/tee_svc_storage.c | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/core/tee/tee_obj.c b/core/tee/tee_obj.c index 62751f3b..64d3df36 100644 --- a/core/tee/tee_obj.c +++ b/core/tee/tee_obj.c @@ -64,7 +64,7 @@ TEE_Result tee_obj_verify(struct tee_ta_session *sess, struct tee_obj *o) res = fops->open(o->pobj, NULL, &fh); if (res == TEE_ERROR_CORRUPT_OBJECT) { - EMSG("Object corrupt\n"); + EMSG("Object corrupt"); fops->remove(o->pobj); tee_obj_close(to_user_ta_ctx(sess->ctx), o); } diff --git a/core/tee/tee_rpmb_fs.c b/core/tee/tee_rpmb_fs.c index 0d123484..de4868d1 100644 --- a/core/tee/tee_rpmb_fs.c +++ b/core/tee/tee_rpmb_fs.c @@ -1011,7 +1011,7 @@ static TEE_Result tee_rpmb_verify_key_sync_counter(uint16_t dev_id) rpmb_ctx->wr_cnt_synced = true; } - DMSG("Verify key returning 0x%x\n", res); + DMSG("Verify key returning 0x%x", res); return res; } diff --git a/core/tee/tee_svc_storage.c b/core/tee/tee_svc_storage.c index 5378d2a3..7bee121a 100644 --- a/core/tee/tee_svc_storage.c +++ b/core/tee/tee_svc_storage.c @@ -192,7 +192,7 @@ static TEE_Result tee_svc_storage_read_head(struct tee_obj *o) res = fops->read(o->fh, 0, &head, &bytes); if (res != TEE_SUCCESS) { if (res == TEE_ERROR_CORRUPT_OBJECT) - EMSG("Head corrupt\n"); + EMSG("Head corrupt"); goto exit; } @@ -830,9 +830,8 @@ TEE_Result syscall_storage_obj_read(unsigned long obj, void *data, size_t len, res = o->pobj->fops->read(o->fh, o->ds_pos + o->info.dataPosition, data, &bytes); if (res != TEE_SUCCESS) { - EMSG("Error code=%x\n", (uint32_t)res); if (res == TEE_ERROR_CORRUPT_OBJECT) { - EMSG("Object corrupt\n"); + EMSG("Object corrupt"); tee_svc_storage_remove_corrupt_obj(sess, o); } goto exit; @@ -928,7 +927,7 @@ TEE_Result syscall_storage_obj_trunc(unsigned long obj, size_t len) res = o->pobj->fops->truncate(o->fh, len + off); if (res != TEE_SUCCESS) { if (res == TEE_ERROR_CORRUPT_OBJECT) { - EMSG("Object corrupt\n"); + EMSG("Object corrupt"); res = tee_svc_storage_remove_corrupt_obj(sess, o); if (res != TEE_SUCCESS) goto exit; |