summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-10 14:09:13 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-17 20:36:14 -0400
commit6dabea9882ee965041cf42c95e8b2bcff95fbfa0 (patch)
tree392ff6b871d23b57cb11825b66900e879e2e9992
parent7b5b4fc84ff0067fb0e7b5a3b86a4b16784e8ffa (diff)
gpu: nvgpu: gv11b: 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 the last remaining user of old macros to new ones. JIRA NVGPU-16 Change-Id: Ib665cfb395fe46ac988ed14d67adef885098e524 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1462968 Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit
-rw-r--r--drivers/gpu/nvgpu/gv11b/ltc_gv11b.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index daad8718..415266af 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -81,8 +81,7 @@ u32 gv11b_ltc_cbc_fix_config(struct gk20a *g, int base)
81 if (ltc_ltcs_ltss_cbc_num_active_ltcs__v(val) == 2) 81 if (ltc_ltcs_ltss_cbc_num_active_ltcs__v(val) == 2)
82 return base * 2; 82 return base * 2;
83 else if (ltc_ltcs_ltss_cbc_num_active_ltcs__v(val) != 1) { 83 else if (ltc_ltcs_ltss_cbc_num_active_ltcs__v(val) != 1) {
84 gk20a_err(dev_from_gk20a(g), 84 nvgpu_err(g, "Invalid number of active ltcs: %08x\n", val);
85 "Invalid number of active ltcs: %08x\n", val);
86 } 85 }
87 return base; 86 return base;
88} 87}