irqchip: mips-gic: Remove gic_read_local_vp_id() (9762d2e6) · Commits · 戴 / test

drivers/irqchip/irq-mips-gic.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -138,14 +138,6 @@ static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe)
		GIC_SH_MAP_TO_VPE_REG_BIT(vpe));
		}

		unsigned gic_read_local_vp_id(void)
		{
		unsigned long ident;

		ident = gic_read(GIC_REG(VPE_LOCAL, GIC_VP_IDENT));
		return ident & GIC_VP_IDENT_VCNUM_MSK;
		}

		static bool gic_local_irq_is_routable(int intr)
		{
		u32 vpe_ctl;

+0 −17

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@
		#define GIC_VPE_SWINT0_MAP_OFS 0x0054
		#define GIC_VPE_SWINT1_MAP_OFS 0x0058
		#define GIC_VPE_OTHER_ADDR_OFS 0x0080
		#define GIC_VP_IDENT_OFS 0x0088
		#define GIC_VPE_WD_CONFIG0_OFS 0x0090
		#define GIC_VPE_WD_COUNT0_OFS 0x0094
		#define GIC_VPE_WD_INITIAL0_OFS 0x0098
		@@ -197,10 +196,6 @@
		#define GIC_VPE_SMASK_FDC_SHF 6
		#define GIC_VPE_SMASK_FDC_MSK (MSK(1) << GIC_VPE_SMASK_FDC_SHF)

		/* GIC_VP_IDENT fields */
		#define GIC_VP_IDENT_VCNUM_SHF 0
		#define GIC_VP_IDENT_VCNUM_MSK (MSK(6) << GIC_VP_IDENT_VCNUM_SHF)

		/* GIC nomenclature for Core Interrupt Pins. */
		#define GIC_CPU_INT0 0 /* Core Interrupt 2 */
		#define GIC_CPU_INT1 1 /* . */
		@@ -260,16 +255,4 @@ static inline int gic_get_usm_range(struct resource *gic_usm_res)

		#endif /* CONFIG_MIPS_GIC */

		/**
		* gic_read_local_vp_id() - read the local VPs VCNUM
		*
		* Read the VCNUM of the local VP from the GIC_VP_IDENT register and
		* return it to the caller. This ID should be used to refer to the VP
		* via the GICs VP-other region, or when calculating an offset to a
		* bit representing the VP in interrupt masks.
		*
		* Return: The VCNUM value for the local VP.
		*/
		extern unsigned gic_read_local_vp_id(void);

		#endif /* __LINUX_IRQCHIP_MIPS_GIC_H */