From 18fcc5548a5cc53d6169f65f90eb8a056877946a Mon Sep 17 00:00:00 2001 From: Alok Singh Date: Tue, 7 Aug 2018 12:02:05 +0530 Subject: [PATCH] qcacmn: Add return as int for qdf hrtimer cancel Add return value as int to check the success and failure of hrtimer cancel. CRs-Fixed: 2292414 Change-Id: I7bfe94882551533c3f6b4164a2a3f778216b281b --- qdf/inc/qdf_hrtimer.h | 6 +++--- qdf/linux/src/i_qdf_hrtimer.h | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/qdf/inc/qdf_hrtimer.h b/qdf/inc/qdf_hrtimer.h index 21f584a130..0f48678ddc 100644 --- a/qdf/inc/qdf_hrtimer.h +++ b/qdf/inc/qdf_hrtimer.h @@ -58,12 +58,12 @@ void qdf_hrtimer_start(qdf_hrtimer_data_t *timer, qdf_ktime_t interval, * * Cancels hrtimer in given context * - * Return: void + * Return: int */ static inline -void qdf_hrtimer_cancel(qdf_hrtimer_data_t *timer) +int qdf_hrtimer_cancel(qdf_hrtimer_data_t *timer) { - __qdf_hrtimer_cancel(timer); + return __qdf_hrtimer_cancel(timer); } /** diff --git a/qdf/linux/src/i_qdf_hrtimer.h b/qdf/linux/src/i_qdf_hrtimer.h index 0998ecb8b7..6c6b6d575f 100644 --- a/qdf/linux/src/i_qdf_hrtimer.h +++ b/qdf/linux/src/i_qdf_hrtimer.h @@ -66,15 +66,17 @@ void __qdf_hrtimer_start(__qdf_hrtimer_data_t *timer, ktime_t interval, * * cancels hrtimer in given context * - * Return: void + * Return: int */ static inline -void __qdf_hrtimer_cancel(__qdf_hrtimer_data_t *timer) +int __qdf_hrtimer_cancel(__qdf_hrtimer_data_t *timer) { if (timer->ctx == QDF_CONTEXT_HARDWARE) - hrtimer_cancel(&timer->u.hrtimer); + return hrtimer_cancel(&timer->u.hrtimer); else if (timer->ctx == QDF_CONTEXT_TASKLET) - hrtimer_cancel(&timer->u.tasklet_hrtimer.timer); + return hrtimer_cancel(&timer->u.tasklet_hrtimer.timer); + + return 0; } /**