diff --git a/hif/src/ce/ce_main.h b/hif/src/ce/ce_main.h
index 79ed10962c..7a799689ac 100644
--- a/hif/src/ce/ce_main.h
+++ b/hif/src/ce/ce_main.h
@@ -126,7 +126,7 @@ struct HIF_CE_state {
 	bool fake_sleep;
 	qdf_timer_t sleep_timer;
 	bool sleep_timer_init;
-	unsigned long sleep_ticks;
+	qdf_time_t sleep_ticks;
 
 	/* Per-pipe state. */
 	struct HIF_CE_pipe_info pipe_info[CE_COUNT_MAX];
diff --git a/qdf/inc/qdf_time.h b/qdf/inc/qdf_time.h
index 2bc3f3cc31..3faed02dde 100644
--- a/qdf/inc/qdf_time.h
+++ b/qdf/inc/qdf_time.h
@@ -43,7 +43,7 @@ typedef __qdf_time_t qdf_time_t;
  *
  * Return: ticks
  */
-static inline unsigned long qdf_system_ticks(void)
+static inline qdf_time_t qdf_system_ticks(void)
 {
 	return __qdf_system_ticks();
 }
@@ -65,7 +65,7 @@ static inline uint32_t qdf_system_ticks_to_msecs(unsigned long clock_ticks)
  *
  * Return: unsigned long number of ticks
  */
-static inline unsigned long qdf_system_msecs_to_ticks(uint32_t msecs)
+static inline qdf_time_t qdf_system_msecs_to_ticks(uint32_t msecs)
 {
 	return __qdf_system_msecs_to_ticks(msecs);
 }
@@ -74,9 +74,9 @@ static inline unsigned long qdf_system_msecs_to_ticks(uint32_t msecs)
  * qdf_get_system_uptime - Return a monotonically increasing time
  * This increments once per HZ ticks
  *
- * Return: unsigned long system up time
+ * Return: qdf_time_t system up time in ticks
  */
-static inline unsigned long qdf_get_system_uptime(void)
+static inline qdf_time_t qdf_get_system_uptime(void)
 {
 	return __qdf_get_system_uptime();
 }
@@ -84,7 +84,7 @@ static inline unsigned long qdf_get_system_uptime(void)
 /**
  * qdf_get_system_timestamp - Return current timestamp
  *
- * Return: unsigned long
+ * Return: unsigned long timestamp in ms.
  */
 static inline unsigned long qdf_get_system_timestamp(void)
 {
diff --git a/qdf/linux/src/i_qdf_time.h b/qdf/linux/src/i_qdf_time.h
index ee05ecc826..3d66c4d4c6 100644
--- a/qdf/linux/src/i_qdf_time.h
+++ b/qdf/linux/src/i_qdf_time.h
@@ -84,7 +84,7 @@ static inline __qdf_time_t __qdf_get_system_uptime(void)
 	return jiffies;
 }
 
-static inline __qdf_time_t __qdf_get_system_timestamp(void)
+static inline unsigned long __qdf_get_system_timestamp(void)
 {
 	return (jiffies / HZ) * 1000 + (jiffies % HZ) * (1000 / HZ);
 }