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_fll.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/clk/clk_fll.c') diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index 7694e720..e097e593 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c @@ -45,7 +45,7 @@ static u32 _clk_fll_devgrp_pmudatainit_super(struct gk20a *g, status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); if (status) { - gk20a_err(dev_from_gk20a(g), "failed to init fll pmuobjgrp"); + nvgpu_err(g, "failed to init fll pmuobjgrp"); return status; } pset->lut_num_entries = pfll_objs->lut_num_entries; @@ -118,7 +118,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) status = boardobjgrpconstruct_e32(&g->clk_pmu.avfs_fllobjs.super); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error creating boardobjgrp for fll, status - 0x%x", status); goto done; } @@ -130,7 +130,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, clk, CLK, clk_fll_device, CLK_FLL_DEVICE); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", status); goto done; @@ -155,7 +155,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) &g->clk_pmu.avfs_fllobjs.super.super, clk, CLK, clk_fll_device, CLK_FLL_DEVICE); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", status); goto done; @@ -179,7 +179,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) &pfllobjs->lut_prog_master_mask.super, BOARDOBJ_GET_IDX(pfll)); if (status) { - gk20a_err(dev_from_gk20a(g), "err setting lutprogmask"); + nvgpu_err(g, "err setting lutprogmask"); goto done; } pfll_master = pfll; @@ -188,7 +188,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) g, pfllobjs, pfll_master, pfll); if (status) { - gk20a_err(dev_from_gk20a(g), "err setting lutslavemask"); + nvgpu_err(g, "err setting lutslavemask"); goto done; } } -- cgit v1.2.2