From 9467646a87a12d5227e797c20b8d1df4647cf70c Mon Sep 17 00:00:00 2001 From: Nicolas Benech Date: Wed, 30 Jan 2019 10:51:59 -0500 Subject: [PATCH] gpu: nvgpu: nvgpu_cond_signal to return void MISRA Rule-17.7 requires the return value of all functions to be used. Fix is either to use the return value or change the function to return void. This patch changes nvgpu_cond_signal and nvgpu_cond_signal_interruptible to return void since no callers were using the return value. JIRA NVGPU-677 Change-Id: I406309bde247e7ca656c91be1ea5ab742b0a045a Signed-off-by: Nicolas Benech Reviewed-on: https://git-master.nvidia.com/r/2007563 Reviewed-by: svc-misra-checker Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c | 2 +- drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c | 2 +- drivers/gpu/nvgpu/gv100/clk_arb_gv100.c | 2 +- drivers/gpu/nvgpu/include/nvgpu/cond.h | 4 ++-- drivers/gpu/nvgpu/os/linux/cond.c | 14 ++++---------- drivers/gpu/nvgpu/os/posix/cond.c | 12 ++++-------- 6 files changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c b/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c index bacf2f2ad..18a10a01b 100644 --- a/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c +++ b/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c @@ -72,7 +72,7 @@ static int tu104_pmu_handle_perf_event(struct gk20a *g, void *pmumsg) switch (msg->msg_type) { case NV_PMU_PERF_MSG_ID_VFE_CALLBACK: perf_pmu->vfe_init.state_change = true; - (void) nvgpu_cond_signal(&perf_pmu->vfe_init.wq); + nvgpu_cond_signal(&perf_pmu->vfe_init.wq); nvgpu_clk_arb_schedule_vf_table_update(g); break; case NV_PMU_PERF_MSG_ID_CHANGE_SEQ_COMPLETION: diff --git a/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c b/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c index f1f93398a..4f085fcbc 100644 --- a/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c +++ b/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c @@ -148,7 +148,7 @@ static void vfe_thread_stop_cb(void *data) { struct nvgpu_cond *cond = (struct nvgpu_cond *)data; - (void)nvgpu_cond_signal(cond); + nvgpu_cond_signal(cond); } void perf_pmu_free_pmupstate(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c b/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c index c25906a24..56c1b0108 100644 --- a/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c +++ b/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c @@ -651,7 +651,7 @@ void gv100_clk_arb_run_arbiter_cb(struct nvgpu_clk_arb *arb) /* VF Update complete */ nvgpu_clk_arb_set_global_alarm(g, EVENT(VF_UPDATE)); - (void)nvgpu_cond_signal_interruptible(&arb->request_wq); + nvgpu_cond_signal_interruptible(&arb->request_wq); #ifdef CONFIG_DEBUG_FS g->ops.ptimer.read_ptimer(g, &t1); diff --git a/drivers/gpu/nvgpu/include/nvgpu/cond.h b/drivers/gpu/nvgpu/include/nvgpu/cond.h index 49e9d1f91..2fadd2f75 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/cond.h +++ b/drivers/gpu/nvgpu/include/nvgpu/cond.h @@ -57,7 +57,7 @@ int nvgpu_cond_init(struct nvgpu_cond *cond); * * The waiter is using an uninterruptible wait. */ -int nvgpu_cond_signal(struct nvgpu_cond *cond); +void nvgpu_cond_signal(struct nvgpu_cond *cond); /** * nvgpu_cond_signal_interruptible - Signal a condition variable @@ -69,7 +69,7 @@ int nvgpu_cond_signal(struct nvgpu_cond *cond); * * The waiter is using an interruptible wait. */ -int nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond); +void nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond); /** * nvgpu_cond_broadcast - Signal all waiters of a condition variable diff --git a/drivers/gpu/nvgpu/os/linux/cond.c b/drivers/gpu/nvgpu/os/linux/cond.c index 633c34fd0..5c954c121 100644 --- a/drivers/gpu/nvgpu/os/linux/cond.c +++ b/drivers/gpu/nvgpu/os/linux/cond.c @@ -32,24 +32,18 @@ void nvgpu_cond_destroy(struct nvgpu_cond *cond) cond->initialized = false; } -int nvgpu_cond_signal(struct nvgpu_cond *cond) +void nvgpu_cond_signal(struct nvgpu_cond *cond) { - if (!cond->initialized) - return -EINVAL; + BUG_ON(!cond->initialized); wake_up(&cond->wq); - - return 0; } -int nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond) +void nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond) { - if (!cond->initialized) - return -EINVAL; + BUG_ON(!cond->initialized); wake_up_interruptible(&cond->wq); - - return 0; } int nvgpu_cond_broadcast(struct nvgpu_cond *cond) diff --git a/drivers/gpu/nvgpu/os/posix/cond.c b/drivers/gpu/nvgpu/os/posix/cond.c index 118b02157..02e7826e1 100644 --- a/drivers/gpu/nvgpu/os/posix/cond.c +++ b/drivers/gpu/nvgpu/os/posix/cond.c @@ -40,28 +40,24 @@ int nvgpu_cond_init(struct nvgpu_cond *cond) return ret; } -int nvgpu_cond_signal(struct nvgpu_cond *cond) +void nvgpu_cond_signal(struct nvgpu_cond *cond) { - int ret; if (cond == NULL || !cond->initialized) { BUG(); } nvgpu_mutex_acquire(&cond->mutex); - ret = pthread_cond_signal(&cond->cond); + (void) pthread_cond_signal(&cond->cond); nvgpu_mutex_release(&cond->mutex); - return ret; } -int nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond) +void nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond) { - int ret; if (cond == NULL || !cond->initialized) { BUG(); } nvgpu_mutex_acquire(&cond->mutex); - ret = pthread_cond_signal(&cond->cond); + (void) pthread_cond_signal(&cond->cond); nvgpu_mutex_release(&cond->mutex); - return ret; } int nvgpu_cond_broadcast(struct nvgpu_cond *cond)