[PARISC] use fls_long in irq.c

Kyle McMartin · Kyle McMartin · commit 0c2de3c6c481 · 2007-02-17T01:00:25.000-05:00
Signed-off-by: Kyle McMartin &lt;kyle@parisc-linux.org&gt;
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
@@ -336,11 +336,7 @@ unsigned int txn_alloc_data(unsigned int virt_irq)
 
 static inline int eirr_to_irq(unsigned long eirr)
 {
-#ifdef CONFIG_64BIT
-	int bit = fls64(eirr);
-#else
-	int bit = fls(eirr);
-#endif
+	int bit = fls_long(eirr);
 	return (BITS_PER_LONG - bit) + TIMER_IRQ;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -336,11 +336,7 @@ unsigned int txn_alloc_data(unsigned int virt_irq)`
`336`	`336`
`337`	`337`	`static inline int eirr_to_irq(unsigned long eirr)`
`338`	`338`	`{`
`339`		`-#ifdef CONFIG_64BIT`
`340`		`- int bit = fls64(eirr);`
`341`		`-#else`
`342`		`- int bit = fls(eirr);`
`343`		`-#endif`
	`339`	`+ int bit = fls_long(eirr);`
`344`	`340`	`return (BITS_PER_LONG - bit) + TIMER_IRQ;`
`345`	`341`	`}`
`346`	`342`