Commit dd016350 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

irqchip: mips-gic: Move gic_get_c0_*_int() to asm/mips-gic.h 



The linux/irqchip/mips-gic.h header is now almost empty. Move the
declarations of gic_get_c0_compare_int(), gic_get_c0_perfcount_int() &
gic_get_c0_fdc_int() to asm/mips-gic.h in order to close in on being
able to delete the former header.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17046/


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

arch/mips/generic/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/init.h>

#include <linux/irqchip/mips-gic.h>

#include <linux/types.h>



#include <asm/irq.h>

arch/mips/include/asm/mips-gic.h

+30 −0
Original line number Diff line number Diff line
@@ -314,4 +314,34 @@ static inline bool mips_gic_present(void) 
	return IS_ENABLED(CONFIG_MIPS_GIC) && mips_gic_base;

}



/**

 * gic_get_c0_compare_int() - Return cp0 count/compare interrupt virq

 *

 * Determine the virq number to use for the coprocessor 0 count/compare

 * interrupt, which may be routed via the GIC.

 *

 * Returns the virq number or a negative error number.

 */

extern int gic_get_c0_compare_int(void);



/**

 * gic_get_c0_perfcount_int() - Return performance counter interrupt virq

 *

 * Determine the virq number to use for CPU performance counter interrupts,

 * which may be routed via the GIC.

 *

 * Returns the virq number or a negative error number.

 */

extern int gic_get_c0_perfcount_int(void);



/**

 * gic_get_c0_fdc_int() - Return fast debug channel interrupt virq

 *

 * Determine the virq number to use for fast debug channel (FDC) interrupts,

 * which may be routed via the GIC.

 *

 * Returns the virq number or a negative error number.

 */

extern int gic_get_c0_fdc_int(void);



#endif /* __MIPS_ASM_MIPS_CPS_H__ */

arch/mips/mti-malta/malta-time.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/irqchip/mips-gic.h>

#include <linux/timex.h>

#include <linux/mc146818rtc.h>

arch/mips/pistachio/time.c

+1 −1
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/init.h>

#include <linux/irqchip/mips-gic.h>

#include <linux/of.h>



#include <asm/mips-cps.h>

#include <asm/time.h>



unsigned int get_c0_compare_int(void)

arch/mips/ralink/irq-gic.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#include <linux/of.h>

#include <linux/irqchip.h>

#include <linux/irqchip/mips-gic.h>

#include <asm/mips-cps.h>



int get_c0_perfcount_int(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE