Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f06bc7 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 6f2ea729
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,6 @@ static inline int generic_irq_demux(int irq)
	return irq;
	return irq;
}
}


#define irq_canonicalize(irq)	(irq)
#define irq_demux(irq)		sh_mv.mv_irq_demux(irq)
#define irq_demux(irq)		sh_mv.mv_irq_demux(irq)


void init_IRQ(void);
void init_IRQ(void);
@@ -54,6 +53,7 @@ extern void irq_ctx_exit(int cpu);
# define irq_ctx_exit(cpu) do { } while (0)
# define irq_ctx_exit(cpu) do { } while (0)
#endif
#endif


#include <asm-generic/irq.h>
#ifdef CONFIG_CPU_SH5
#ifdef CONFIG_CPU_SH5
#include <cpu/irq.h>
#include <cpu/irq.h>
#endif
#endif
+1 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@
 */
 */
#include <linux/compiler.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <linux/types.h>

#include <asm-generic/swab.h>
#define __SWAB_64_THRU_32__


static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
{
+1 −6
Original line number Original line Diff line number Diff line
@@ -8,11 +8,6 @@


#define CLOCK_TICK_RATE		(CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */
#define CLOCK_TICK_RATE		(CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */


typedef unsigned long long cycles_t;
#include <asm-generic/timex.h>

static __inline__ cycles_t get_cycles (void)
{
	return 0;
}


#endif /* __ASM_SH_TIMEX_H */
#endif /* __ASM_SH_TIMEX_H */