Ver código fonte

qcacmn: Remove get API under QDF_TIMER_MULTIPLIER_FRAC

Set QDF_TIMER_MULTIPLIER_FRAC to default multiplier if it is defined.
Remove get API under this feature flag so that this can be modified using
set dynamically based on the emulation target detect.

Change-Id: If0743e6b571832ebf3319f9895350685a5cd53f0
CRs-Fixed: 2995514
Kiran Venkatappa 4 anos atrás
pai
commit
a41cb25122
2 arquivos alterados com 4 adições e 13 exclusões
  1. 0 5
      qdf/linux/src/i_qdf_timer.h
  2. 4 8
      qdf/linux/src/qdf_mc_timer.c

+ 0 - 5
qdf/linux/src/i_qdf_timer.h

@@ -43,13 +43,8 @@ struct __qdf_timer_t {
 	void *context;
 };
 
-#ifdef QDF_TIMER_MULTIPLIER_FRAC
-#define __qdf_scaled_msecs_to_jiffies(msec) \
-	(QDF_TIMER_MULTIPLIER_FRAC * msecs_to_jiffies(msec))
-#else
 #define __qdf_scaled_msecs_to_jiffies(msec) \
 	(qdf_timer_get_multiplier() * msecs_to_jiffies(msec))
-#endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
 static inline void __os_timer_shim(struct timer_list *os_timer)

+ 4 - 8
qdf/linux/src/qdf_mc_timer.c

@@ -37,7 +37,11 @@
 #define LINUX_INVALID_TIMER_COOKIE 0xfeedface
 #define TMR_INVALID_ID (0)
 
+#ifdef QDF_TIMER_MULTIPLIER_FRAC
+static uint32_t g_qdf_timer_multiplier = QDF_TIMER_MULTIPLIER_FRAC;
+#else
 static uint32_t g_qdf_timer_multiplier = 1;
+#endif
 
 inline void qdf_timer_set_multiplier(uint32_t multiplier)
 {
@@ -45,19 +49,11 @@ inline void qdf_timer_set_multiplier(uint32_t multiplier)
 }
 qdf_export_symbol(qdf_timer_set_multiplier);
 
-#ifdef QDF_TIMER_MULTIPLIER_FRAC
-inline uint32_t qdf_timer_get_multiplier(void)
-{
-	return QDF_TIMER_MULTIPLIER_FRAC;
-}
-qdf_export_symbol(qdf_timer_get_multiplier);
-#else
 inline uint32_t qdf_timer_get_multiplier(void)
 {
 	return g_qdf_timer_multiplier;
 }
 qdf_export_symbol(qdf_timer_get_multiplier);
-#endif
 
 /* Type declarations */