From 1add126551309a323ae422be41c9db2203bbe112 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 12:17:26 -0700 Subject: gpu: nvgpu: clk: Use new error macros gk20a_err() and gk20a_warn() require a struct device pointer, which is not portable across operating systems. The new nvgpu_err() and nvgpu_warn() macros take struct gk20a pointer. Convert code to use the more portable macros. JIRA NVGPU-16 Change-Id: I58bb9e2fb7e5b18f74fbb92b70150cce97968fc3 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457347 Reviewed-by: Alex Waterman --- drivers/gpu/nvgpu/clk/clk_prog.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'drivers/gpu/nvgpu/clk/clk_prog.c') diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index dc9c58a6..5697c255 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c @@ -46,8 +46,7 @@ static u32 _clk_progs_pmudatainit(struct gk20a *g, status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); if (status) { - gk20a_err(dev_from_gk20a(g), - "error updating pmu boardobjgrp for clk prog 0x%x", + nvgpu_err(g, "error updating pmu boardobjgrp for clk prog 0x%x", status); goto done; } @@ -89,7 +88,7 @@ u32 clk_prog_sw_setup(struct gk20a *g) status = boardobjgrpconstruct_e255(&g->clk_pmu.clk_progobjs.super); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error creating boardobjgrp for clk prog, status - 0x%x", status); goto done; @@ -103,7 +102,7 @@ u32 clk_prog_sw_setup(struct gk20a *g) status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, clk, CLK, clk_prog, CLK_PROG); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", status); goto done; @@ -118,8 +117,7 @@ u32 clk_prog_sw_setup(struct gk20a *g) status = clk_domain_clk_prog_link(g, &g->clk_pmu); if (status) { - gk20a_err(dev_from_gk20a(g), - "error constructing VF point board objects"); + nvgpu_err(g, "error constructing VF point board objects"); goto done; } @@ -265,8 +263,7 @@ static u32 devinit_get_clk_prog_table(struct gk20a *g, break; default: - gk20a_err(dev_from_gk20a(g), - "invalid source %d", prog_type); + nvgpu_err(g, "invalid source %d", prog_type); status = -EINVAL; goto done; } @@ -346,16 +343,15 @@ static u32 devinit_get_clk_prog_table(struct gk20a *g, default: - gk20a_err(dev_from_gk20a(g), - "source issue %d", prog_type); + nvgpu_err(g, "source issue %d", prog_type); status = -EINVAL; goto done; } pprog = construct_clk_prog(g, (void *)&prog_data); if (pprog == NULL) { - gk20a_err(dev_from_gk20a(g), - "error constructing clk_prog boardobj %d", i); + nvgpu_err(g, + "error constructing clk_prog boardobj %d", i); status = -EINVAL; goto done; } @@ -363,8 +359,7 @@ static u32 devinit_get_clk_prog_table(struct gk20a *g, status = boardobjgrp_objinsert(&pclkprogobjs->super.super, (struct boardobj *)pprog, i); if (status) { - gk20a_err(dev_from_gk20a(g), - "error adding clk_prog boardobj %d", i); + nvgpu_err(g, "error adding clk_prog boardobj %d", i); status = -EINVAL; goto done; } @@ -930,7 +925,7 @@ static u32 vflookup_prog_1x_master for (j = pvfentry->vf_point_idx_first; j <= pvfentry->vf_point_idx_last; j++) { pvfpoint = CLK_CLK_VF_POINT_GET(pclk, j); - gk20a_err(dev_from_gk20a(g), "v %x c %x", + nvgpu_err(g, "v %x c %x", clkvfpointvoltageuvget(g, pvfpoint), clkvfpointfreqmhzget(g, pvfpoint)); } -- cgit v1.2.2