From 0e39ad429e8aa68cd11e464cd76a8b9d1912fb7d Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 29 Jan 2018 16:15:58 -0800 Subject: gpu: nvgpu: vgpu: move to nvgpu_err/info from dev_err/info It helps code be more portable. Jira EVLR-2364 Change-Id: I0cc1fa739d7884d3c863975f08b3b592acd34613 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1649941 Reviewed-by: Aingara Paramakuru Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c') diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c index 3e493506..f7e24382 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c @@ -54,7 +54,7 @@ int vgpu_fecs_trace_init(struct gk20a *g) err = of_parse_phandle_with_fixed_args(np, "mempool-fecs-trace", 1, 0, &args); if (err) { - dev_info(dev_from_gk20a(g), "does not support fecs trace\n"); + nvgpu_info(g, "does not support fecs trace"); goto fail; } __nvgpu_set_enabled(g, NVGPU_SUPPORT_FECS_CTXSW_TRACE, true); @@ -62,8 +62,8 @@ int vgpu_fecs_trace_init(struct gk20a *g) mempool = args.args[0]; vcst->cookie = vgpu_ivm_mempool_reserve(mempool); if (IS_ERR(vcst->cookie)) { - dev_info(dev_from_gk20a(g), - "mempool %u reserve failed\n", mempool); + nvgpu_info(g, + "mempool %u reserve failed", mempool); vcst->cookie = NULL; err = -EINVAL; goto fail; @@ -72,15 +72,14 @@ int vgpu_fecs_trace_init(struct gk20a *g) vcst->buf = ioremap_cache(vgpu_ivm_get_ipa(vcst->cookie), vgpu_ivm_get_size(vcst->cookie)); if (!vcst->buf) { - dev_info(dev_from_gk20a(g), "ioremap_cache failed\n"); + nvgpu_info(g, "ioremap_cache failed"); err = -EINVAL; goto fail; } vcst->header = vcst->buf; vcst->num_entries = vcst->header->num_ents; if (unlikely(vcst->header->ent_size != sizeof(*vcst->entries))) { - dev_err(dev_from_gk20a(g), - "entry size mismatch\n"); + nvgpu_err(g, "entry size mismatch"); goto fail; } vcst->entries = vcst->buf + sizeof(*vcst->header); -- cgit v1.2.2