Merge branch 'for-next/cpus_have_const_cap' into for-next/core

[linux-2.6-block.git] / drivers / irqchip / irq-gic-v3.c

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 580f155fa0ffcf76613ae2736a9f94829b31ca1e..00060db0dbe24593320a6691f3826767a3f94bd1 100644 (file)
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -277,17 +277,6 @@ static void gic_redist_wait_for_rwp(void)
        gic_do_wait_for_rwp(gic_data_rdist_rd_base(), GICR_CTLR_RWP);
 }
 
-#ifdef CONFIG_ARM64
-
-static u64 __maybe_unused gic_read_iar(void)
-{
-       if (cpus_have_const_cap(ARM64_WORKAROUND_CAVIUM_23154))
-               return gic_read_iar_cavium_thunderx();
-       else
-               return gic_read_iar_common();
-}
-#endif
-
 static void gic_enable_redist(bool enable)
 {
        void __iomem *rbase;