Commit 3263d085 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle
Browse files

irqchip: mips-gic: Remove unnecessary globals 



Now that all GIC interrupt routing and handling logic is in the GIC
driver itself, un-export variables/functions which are no longer used
outside the GIC driver.  This also allows us to remove gic_compare_int
and combine gic_get_int_mask with gic_get_int since these interfaces
are no longer used.

Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Reviewed-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Tested-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeffrey Deans <jeffrey.deans@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7820/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e9de688d

arch/mips/include/asm/gic.h

+0 −5
Original line number Diff line number Diff line
@@ -364,13 +364,11 @@ 
extern unsigned int gic_present;

extern unsigned int gic_frequency;

extern unsigned long _gic_base;

extern unsigned int gic_cpu_pin;



extern void gic_init(unsigned long gic_base_addr,

	unsigned long gic_addrspace_size, unsigned int cpu_vec,

	unsigned int irqbase);

extern void gic_clocksource_init(unsigned int);

extern unsigned int gic_compare_int (void);

extern cycle_t gic_read_count(void);

extern cycle_t gic_read_compare(void);

extern void gic_write_compare(cycle_t cnt);
@@ -378,10 +376,7 @@ extern void gic_write_cpu_compare(cycle_t cnt, int cpu); 
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 void gic_get_int_mask(unsigned long *dst, const unsigned long *src);

extern unsigned int gic_get_int(void);

extern int gic_get_c0_compare_int(void);

extern int gic_get_c0_perfcount_int(void);

#endif /* _ASM_GICREGS_H */

drivers/irqchip/irq-mips-gic.c

+4 −24
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
unsigned int gic_frequency;

unsigned int gic_present;

unsigned long _gic_base;

unsigned int gic_cpu_pin;



struct gic_pcpu_mask {

	DECLARE_BITMAP(pcpu_mask, GIC_MAX_INTRS);
@@ -45,6 +44,7 @@ static DEFINE_SPINLOCK(gic_lock); 
static struct irq_domain *gic_irq_domain;

static int gic_shared_intrs;

static int gic_vpes;

static unsigned int gic_cpu_pin;

static struct irq_chip gic_level_irq_controller, gic_edge_irq_controller;



static void __gic_irq_dispatch(void);
@@ -129,7 +129,7 @@ unsigned int gic_get_timer_pending(void) 
	return vpe_pending & GIC_VPE_PEND_TIMER_MSK;

}



void gic_bind_eic_interrupt(int irq, int set)

static void gic_bind_eic_interrupt(int irq, int set)

{

	/* Convert irq vector # to hw int # */

	irq -= GIC_PIN_TO_VEC_OFFSET;
@@ -143,17 +143,6 @@ void gic_send_ipi(unsigned int intr) 
	GICWRITE(GIC_REG(SHARED, GIC_SH_WEDGE), 0x80000000 | intr);

}



unsigned int gic_compare_int(void)

{

	unsigned int pending;



	GICREAD(GIC_REG(VPE_LOCAL, GIC_VPE_PEND), pending);

	if (pending & GIC_VPE_PEND_CMP_MSK)

		return 1;

	else

		return 0;

}



int gic_get_c0_compare_int(void)

{

	if (!gic_local_irq_is_routable(GIC_LOCAL_INT_TIMER))
@@ -174,7 +163,7 @@ int gic_get_c0_perfcount_int(void) 
				  GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_PERFCTR));

}



void gic_get_int_mask(unsigned long *dst, const unsigned long *src)

static unsigned int gic_get_int(void)

{

	unsigned int i;

	unsigned long *pending, *intrmask, *pcpu_mask;
@@ -199,17 +188,8 @@ void gic_get_int_mask(unsigned long *dst, const unsigned long *src) 


	bitmap_and(pending, pending, intrmask, gic_shared_intrs);

	bitmap_and(pending, pending, pcpu_mask, gic_shared_intrs);

	bitmap_and(dst, src, pending, gic_shared_intrs);

}



unsigned int gic_get_int(void)

{

	DECLARE_BITMAP(interrupts, GIC_MAX_INTRS);



	bitmap_fill(interrupts, gic_shared_intrs);

	gic_get_int_mask(interrupts, interrupts);



	return find_first_bit(interrupts, gic_shared_intrs);

	return find_first_bit(pending, gic_shared_intrs);

}



static void gic_mask_irq(struct irq_data *d)

CRA Git | Maintained and supported by SUSTech CRA and CCSE