diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 16:02:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-10 15:24:22 -0400 |
commit | 3a1104c3699b05201abf48ed9283bb8ccbe42732 (patch) | |
tree | a2e9445f730e9de76cbb7e68d3410a97ded588fa /drivers/gpu/nvgpu/therm/thrmchannel.c | |
parent | 54eb74539342ce0fa6961e46f2ce22b68ad2fb21 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457354
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/therm/thrmchannel.c')
-rw-r--r-- | drivers/gpu/nvgpu/therm/thrmchannel.c | 10 |
1 files changed, 5 insertions, 5 deletions
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, | |||
32 | 32 | ||
33 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); | 33 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); |
34 | if (status) { | 34 | if (status) { |
35 | gk20a_err(dev_from_gk20a(g), | 35 | nvgpu_err(g, |
36 | "error updating pmu boardobjgrp for therm channel 0x%x", | 36 | "error updating pmu boardobjgrp for therm channel 0x%x", |
37 | status); | 37 | status); |
38 | status = -ENOMEM; | 38 | status = -ENOMEM; |
@@ -177,7 +177,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g, | |||
177 | therm_channel_size, therm_channel_data.boardobj.type); | 177 | therm_channel_size, therm_channel_data.boardobj.type); |
178 | 178 | ||
179 | if (!boardobj) { | 179 | if (!boardobj) { |
180 | gk20a_err(dev_from_gk20a(g), | 180 | nvgpu_err(g, |
181 | "unable to create thermal device for %d type %d", | 181 | "unable to create thermal device for %d type %d", |
182 | index, therm_channel_data.boardobj.type); | 182 | index, therm_channel_data.boardobj.type); |
183 | status = -EINVAL; | 183 | status = -EINVAL; |
@@ -188,7 +188,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g, | |||
188 | boardobj, obj_index); | 188 | boardobj, obj_index); |
189 | 189 | ||
190 | if (status) { | 190 | if (status) { |
191 | gk20a_err(dev_from_gk20a(g), | 191 | nvgpu_err(g, |
192 | "unable to insert thermal device boardobj for %d", index); | 192 | "unable to insert thermal device boardobj for %d", index); |
193 | status = -EINVAL; | 193 | status = -EINVAL; |
194 | goto done; | 194 | goto done; |
@@ -211,7 +211,7 @@ u32 therm_channel_sw_setup(struct gk20a *g) | |||
211 | /* Construct the Super Class and override the Interfaces */ | 211 | /* Construct the Super Class and override the Interfaces */ |
212 | status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super); | 212 | status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super); |
213 | if (status) { | 213 | if (status) { |
214 | gk20a_err(dev_from_gk20a(g), | 214 | nvgpu_err(g, |
215 | "error creating boardobjgrp for therm devices, status - 0x%x", | 215 | "error creating boardobjgrp for therm devices, status - 0x%x", |
216 | status); | 216 | status); |
217 | goto done; | 217 | goto done; |
@@ -232,7 +232,7 @@ u32 therm_channel_sw_setup(struct gk20a *g) | |||
232 | status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, | 232 | status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, |
233 | therm, THERM, therm_channel, THERM_CHANNEL); | 233 | therm, THERM, therm_channel, THERM_CHANNEL); |
234 | if (status) { | 234 | if (status) { |
235 | gk20a_err(dev_from_gk20a(g), | 235 | nvgpu_err(g, |
236 | "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", | 236 | "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", |
237 | status); | 237 | status); |
238 | goto done; | 238 | goto done; |