diff --git a/core/cdf/inc/cdf_atomic.h b/core/cdf/inc/cdf_atomic.h
index a30d52bccae7..4ae5dc5b9ab7 100644
--- a/core/cdf/inc/cdf_atomic.h
+++ b/core/cdf/inc/cdf_atomic.h
@@ -62,7 +62,7 @@ static inline void cdf_atomic_init(cdf_atomic_t *v)
  *
  * Return: The current value of the variable
  */
-static inline uint32_t cdf_atomic_read(cdf_atomic_t *v)
+static inline int32_t cdf_atomic_read(cdf_atomic_t *v)
 {
 	return __cdf_atomic_read(v);
 }
@@ -122,7 +122,7 @@ static inline void cdf_atomic_sub(int i, cdf_atomic_t *v)
  *    true (non-zero) if the new value is zero,
  *    or false (0) if the new value is non-zero
  */
-static inline uint32_t cdf_atomic_dec_and_test(cdf_atomic_t *v)
+static inline int32_t cdf_atomic_dec_and_test(cdf_atomic_t *v)
 {
 	return __cdf_atomic_dec_and_test(v);
 }
@@ -144,7 +144,7 @@ static inline void cdf_atomic_set(cdf_atomic_t *v, int i)
  *
  * Return: The current value of the variable
  */
-static inline uint32_t cdf_atomic_inc_return(cdf_atomic_t *v)
+static inline int32_t cdf_atomic_inc_return(cdf_atomic_t *v)
 {
 	return __cdf_atomic_inc_return(v);
 }
diff --git a/core/cdf/src/i_cdf_atomic.h b/core/cdf/src/i_cdf_atomic.h
index 7c08eb982a78..178c3275b490 100644
--- a/core/cdf/src/i_cdf_atomic.h
+++ b/core/cdf/src/i_cdf_atomic.h
@@ -40,7 +40,7 @@ static inline CDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v)
 	return CDF_STATUS_SUCCESS;
 }
 
-static inline uint32_t __cdf_atomic_read(__cdf_atomic_t *v)
+static inline int32_t __cdf_atomic_read(__cdf_atomic_t *v)
 {
 	return atomic_read(v);
 }
@@ -72,7 +72,7 @@ static inline void __cdf_atomic_sub(int i, __cdf_atomic_t *v)
 	atomic_sub(i, v);
 }
 
-static inline uint32_t __cdf_atomic_dec_and_test(__cdf_atomic_t *v)
+static inline int32_t __cdf_atomic_dec_and_test(__cdf_atomic_t *v)
 {
 	return atomic_dec_and_test(v);
 }
@@ -82,7 +82,7 @@ static inline void __cdf_atomic_set(__cdf_atomic_t *v, int i)
 	atomic_set(v, i);
 }
 
-static inline uint32_t __cdf_atomic_inc_return(__cdf_atomic_t *v)
+static inline int32_t __cdf_atomic_inc_return(__cdf_atomic_t *v)
 {
 	return atomic_inc_return(v);
 }