[atheros] remove the clz function, use fls instead

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10878 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c b/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
index ed784ba..69cb362 100644 (file)
--- a/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
+++ b/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/irq_cpu.h>
 #include <asm/io.h>
@@ -39,7 +40,7 @@ static inline void ar5315_gpio_irq(void)
        if (!pend)
                return;
 
-       do_IRQ(AR531X_GPIO_IRQ_BASE + 31 - clz(pend));
+       do_IRQ(AR531X_GPIO_IRQ_BASE + fls(pend) - 1);
 }
 
 

diff --git a/target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x.h
index dccf541..ba52a2b 100644 (file)
--- a/target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x.h
+++ b/target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x.h
@@ -11,29 +11,6 @@
 extern void (*board_time_init)(void);
 #endif
 
-/*
- * C access to CLZ instruction
- * (count leading zeroes).
- */
-static inline int clz(unsigned long val)
-{
-       int ret;
-
-       __asm__ volatile (
-               ".set\tnoreorder\n\t"
-               ".set\tnoat\n\t"
-               ".set\tmips32\n\t"
-               "clz\t%0,%1\n\t"
-               ".set\tmips0\n\t"
-               ".set\tat\n\t"
-               ".set\treorder"
-               : "=r" (ret)
-               : "r" (val)
-       );
-
-       return ret;
-}
-
 /*
  * Atheros CPUs before the AR2315 are using MIPS 4Kc core, later designs are
  * using MIPS 4KEc R2 core. This makes it easy to determine the board at runtime.