irqchip/gicv3-its: Use new jump label API

Robert Richter · KAGA-KOKO · commit 8ac2a1704a9f · 2015-09-29T10:10:54.000+02:00
Use newly introduced jump label API. Make this a separate patch for easier backporting to older kernels of the errata patch set. Signed-off-by: Robert Richter <rrichter@cavium.com> Reviewed-by: Marc Zygnier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Tirumalesh Chalamarla <tchalamarla@cavium.com> Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper <jason@lakedaemon.net> Link: http://lkml.kernel.org/r/1442869119-1814-7-git-send-email-rric@kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
@@ -139,11 +139,11 @@ static u64 gic_read_iar_cavium_thunderx(void)
 	return irqstat;
 }
 
-static struct static_key is_cavium_thunderx = STATIC_KEY_INIT_FALSE;
+static DEFINE_STATIC_KEY_FALSE(is_cavium_thunderx);
 
 static u64 __maybe_unused gic_read_iar(void)
 {
-	if (static_key_false(&is_cavium_thunderx))
+	if (static_branch_unlikely(&is_cavium_thunderx))
 		return gic_read_iar_cavium_thunderx();
 	else
 		return gic_read_iar_common();
@@ -871,7 +871,7 @@ static const struct irq_domain_ops gic_irq_domain_ops = {
 static void gicv3_enable_quirks(void)
 {
 	if (cpus_have_cap(ARM64_WORKAROUND_CAVIUM_23154))
-		static_key_slow_inc(&is_cavium_thunderx);
+		static_branch_enable(&is_cavium_thunderx);
 }
 
 static int __init gic_of_init(struct device_node *node, struct device_node *parent)

Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,11 @@ static u64 gic_read_iar_cavium_thunderx(void)`
`139`	`139`	`return irqstat;`
`140`	`140`	`}`
`141`	`141`
`142`		`-static struct static_key is_cavium_thunderx = STATIC_KEY_INIT_FALSE;`
	`142`	`+static DEFINE_STATIC_KEY_FALSE(is_cavium_thunderx);`
`143`	`143`
`144`	`144`	`static u64 __maybe_unused gic_read_iar(void)`
`145`	`145`	`{`
`146`		`- if (static_key_false(&is_cavium_thunderx))`
	`146`	`+ if (static_branch_unlikely(&is_cavium_thunderx))`
`147`	`147`	`return gic_read_iar_cavium_thunderx();`
`148`	`148`	`else`
`149`	`149`	`return gic_read_iar_common();`
`@@ -871,7 +871,7 @@ static const struct irq_domain_ops gic_irq_domain_ops = {`
`871`	`871`	`static void gicv3_enable_quirks(void)`
`872`	`872`	`{`
`873`	`873`	`if (cpus_have_cap(ARM64_WORKAROUND_CAVIUM_23154))`
`874`		`- static_key_slow_inc(&is_cavium_thunderx);`
	`874`	`+ static_branch_enable(&is_cavium_thunderx);`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`static int __init gic_of_init(struct device_node node, struct device_node parent)`