From 64f87e9584380ce1912ff2a592f591df3682384c Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Tue, 15 Jan 2019 16:57:04 -0500 Subject: [PATCH] gpu: nvgpu: pmu: fix return in thrm api The api therm_domain_pmu_setup() in thrm.c was return a u32 incorrectly. It should return an int. JIRA NVGPU-1008 Change-Id: I1cf51f26fc2615671bbab4dcf78b4f60b7bdcbeb Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/1995883 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/therm/thrm.c | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/pmu/therm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/common/pmu/therm/thrm.c b/drivers/gpu/nvgpu/common/pmu/therm/thrm.c index 9d3aa725f..26f4c58d5 100644 --- a/drivers/gpu/nvgpu/common/pmu/therm/thrm.c +++ b/drivers/gpu/nvgpu/common/pmu/therm/thrm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -50,7 +50,7 @@ exit: return status; } -u32 therm_domain_pmu_setup(struct gk20a *g) +int therm_domain_pmu_setup(struct gk20a *g) { return therm_send_pmgr_tables_to_pmu(g); } diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmu/therm.h b/drivers/gpu/nvgpu/include/nvgpu/pmu/therm.h index bd16d6b3f..72ed90df9 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pmu/therm.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmu/therm.h @@ -27,7 +27,7 @@ struct gk20a; int therm_domain_sw_setup(struct gk20a *g); -u32 therm_domain_pmu_setup(struct gk20a *g); +int therm_domain_pmu_setup(struct gk20a *g); int therm_pmu_init_pmupstate(struct gk20a *g); void therm_pmu_free_pmupstate(struct gk20a *g); int therm_configure_therm_alert(struct gk20a *g);