carl9170 firmware: fix gcc-4.6 compiler warnings

include/timer.h:87:20: warning: inlining failed in call to \
‘clock_set’: call is unlikely and code size would grow [-Winline]

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/include/timer.h b/carlfw/include/timer.h
index 7f6c491d87247cd5ce1461919db4ae852f82aff3..7e4cb4cd69a2a5a4bebac5a8f4b38f206b7e1fd9 100644 (file)
--- a/carlfw/include/timer.h
+++ b/carlfw/include/timer.h
@@ -84,17 +84,5 @@ static inline __inline void udelay(const uint32_t usec)
        }
 }
 
-static inline void clock_set(enum cpu_clock_t _clock, bool on)
-{
-       /*
-        * Word of Warning!
-        * This setting does more than just mess with the CPU Clock.
-        * So watch out, if you need _stable_ timer interrupts.
-        */
-
-       fw.ticks_per_msec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV, get(AR9170_PWR_REG_PLL_ADDAC)) >> 1;
-
-       set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | _clock));
-}
-
+void clock_set(enum cpu_clock_t _clock, bool on);
 #endif /* __CARL9170FW_TIMER_H */

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 0653ae44dde34bb8be28d9061b014a8c7d298c6c..475308be145f7ec5f68a2615701a11a7cf941296 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -45,6 +45,19 @@ static void timer_init(const unsigned int timer, const unsigned int interval)
        orl(AR9170_TIMER_REG_INTERRUPT, BIT(timer));
 }
 
+void clock_set(enum cpu_clock_t _clock, bool on)
+{
+       /*
+        * Word of Warning!
+        * This setting does more than just mess with the CPU Clock.
+        * So watch out, if you need _stable_ timer interrupts.
+        */
+
+       fw.ticks_per_msec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV, get(AR9170_PWR_REG_PLL_ADDAC)) >> 1;
+
+       set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | _clock));
+}
+
 static void init(void)
 {
        led_init();