From 3a1104c3699b05201abf48ed9283bb8ccbe42732 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 13:02:43 -0700 Subject: gpu: nvgpu: therm: 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: I50bab058076c6896acfc6fa82f78f52a949dd3cf Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457354 Reviewed-by: Alex Waterman --- drivers/gpu/nvgpu/therm/thrmchannel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/therm/thrmchannel.c') diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c index a09a4599..556bad86 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.c +++ b/drivers/gpu/nvgpu/therm/thrmchannel.c @@ -32,7 +32,7 @@ static u32 _therm_channel_pmudatainit_device(struct gk20a *g, status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error updating pmu boardobjgrp for therm channel 0x%x", status); status = -ENOMEM; @@ -177,7 +177,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g, therm_channel_size, therm_channel_data.boardobj.type); if (!boardobj) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "unable to create thermal device for %d type %d", index, therm_channel_data.boardobj.type); status = -EINVAL; @@ -188,7 +188,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g, boardobj, obj_index); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "unable to insert thermal device boardobj for %d", index); status = -EINVAL; goto done; @@ -211,7 +211,7 @@ u32 therm_channel_sw_setup(struct gk20a *g) /* Construct the Super Class and override the Interfaces */ status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error creating boardobjgrp for therm devices, status - 0x%x", status); goto done; @@ -232,7 +232,7 @@ u32 therm_channel_sw_setup(struct gk20a *g) status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, therm, THERM, therm_channel, THERM_CHANNEL); if (status) { - gk20a_err(dev_from_gk20a(g), + nvgpu_err(g, "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", status); goto done; -- cgit v1.2.2