Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Tidy up duplication in irq/swab/timex.h.

The asm-generic versions have some helper definitions that we can use
instead, drop our definitions and use those instead.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+3 -9
+1 -1
arch/sh/include/asm/irq.h
··· 39 39 return irq; 40 40 } 41 41 42 - #define irq_canonicalize(irq) (irq) 43 42 #define irq_demux(irq) sh_mv.mv_irq_demux(irq) 44 43 45 44 void init_IRQ(void); ··· 53 54 # define irq_ctx_exit(cpu) do { } while (0) 54 55 #endif 55 56 57 + #include <asm-generic/irq.h> 56 58 #ifdef CONFIG_CPU_SH5 57 59 #include <cpu/irq.h> 58 60 #endif
+1 -2
arch/sh/include/asm/swab.h
··· 7 7 */ 8 8 #include <linux/compiler.h> 9 9 #include <linux/types.h> 10 - 11 - #define __SWAB_64_THRU_32__ 10 + #include <asm-generic/swab.h> 12 11 13 12 static inline __attribute_const__ __u32 __arch_swab32(__u32 x) 14 13 {
+1 -6
arch/sh/include/asm/timex.h
··· 8 8 9 9 #define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */ 10 10 11 - typedef unsigned long long cycles_t; 12 - 13 - static __inline__ cycles_t get_cycles (void) 14 - { 15 - return 0; 16 - } 11 + #include <asm-generic/timex.h> 17 12 18 13 #endif /* __ASM_SH_TIMEX_H */