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

Commit 2675fa7c authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

MIPS: Formatting clean-ups for clocksources. 



Various whitespace and #ifdef removals for GIC and R4K clocksources.

Signed-off-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
parent dfa762e1

arch/mips/include/asm/gic.h

+1 −3
Original line number Diff line number Diff line
@@ -372,19 +372,17 @@ extern struct gic_shared_intr_map gic_shared_intr_map[]; 
extern void gic_init(unsigned long gic_base_addr,

	unsigned long gic_addrspace_size, struct gic_intr_map *intrmap,

	unsigned int intrmap_size, unsigned int irqbase);



extern void gic_clocksource_init(unsigned int);

extern unsigned int gic_get_int(void);

extern cycle_t gic_read_count(void);

extern void gic_send_ipi(unsigned int intr);

extern unsigned int plat_ipi_call_int_xlate(unsigned int);

extern unsigned int plat_ipi_resched_int_xlate(unsigned int);

extern void gic_bind_eic_interrupt(int irq, int set);

extern unsigned int gic_get_timer_pending(void);

extern unsigned int gic_get_int(void);

extern void gic_enable_interrupt(int irq_vec);

extern void gic_disable_interrupt(int irq_vec);

extern void gic_irq_ack(struct irq_data *d);

extern void gic_finish_irq(struct irq_data *d);

extern void gic_platform_init(int irqs, struct irq_chip *irq_controller);



#endif /* _ASM_GICREGS_H */

arch/mips/include/asm/time.h

+1 −4
Original line number Diff line number Diff line
@@ -52,12 +52,11 @@ extern int (*perf_irq)(void); 
 */

extern unsigned int __weak get_c0_compare_int(void);

extern int r4k_clockevent_init(void);

extern int smtc_clockevent_init(void);



static inline int mips_clockevent_init(void)

{

#ifdef CONFIG_MIPS_MT_SMTC

	extern int smtc_clockevent_init(void);



	return smtc_clockevent_init();

#elif defined(CONFIG_CEVT_R4K)

	return r4k_clockevent_init();
@@ -69,9 +68,7 @@ static inline int mips_clockevent_init(void) 
/*

 * Initialize the count register as a clocksource

 */

#ifdef CONFIG_CSRC_R4K

extern int init_r4k_clocksource(void);

#endif



static inline int init_mips_clocksource(void)

{

arch/mips/kernel/cevt-r4k.c

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 */



#ifndef CONFIG_MIPS_MT_SMTC



static int mips_next_event(unsigned long delta,

			   struct clock_event_device *evt)

{
@@ -49,7 +48,6 @@ DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); 
int cp0_timer_irq_installed;



#ifndef CONFIG_MIPS_MT_SMTC



irqreturn_t c0_compare_interrupt(int irq, void *dev_id)

{

	const int r2 = cpu_has_mips_r2;
@@ -166,7 +164,6 @@ int c0_compare_int_usable(void) 
}



#ifndef CONFIG_MIPS_MT_SMTC



int __cpuinit r4k_clockevent_init(void)

{

	unsigned int cpu = smp_processor_id();