path: root/drivers/irqchip/irq-gic-v3.c
diff options
authorTomasz Nowicki <tn@semihalf.com>2016-05-31 13:19:41 +0200
committerGraeme Gregory <graeme.gregory@linaro.org>2016-06-07 14:06:03 +0100
commit6470816f784247be7ff404eae23a8dc3b50b1c04 (patch)
treee755e75c522e2ac1d0a0cbb7399a54ef61426ba7 /drivers/irqchip/irq-gic-v3.c
parent392ca4cd3e3ab9f2fcb44ac7f5b21fe4196640d4 (diff)
irqchip, GICv3, ITS: Refator ITS DT init code to prepare for ACPI.
In order to add ACPI support we need to isolate ACPI&DT common code and move DT logic to corresponding functions. To achieve this we are using firmware agnostic handle which can be unpacked to either DT or ACPI node. No functional changes other than a very minor one: 1. Fix ITS base register address type (from 'unsigned long' to 'phys_addr_t'), as a bonus we get nice string formatting. 2. Since there is only one of ITS parent domain convert it to static global variable and drop the parameter from its_probe_one. Users can refer to it in more convenient way then. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
Diffstat (limited to 'drivers/irqchip/irq-gic-v3.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 2c5ba0e704bf..019b44215087 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -911,7 +911,6 @@ static int __init gic_init_bases(void __iomem *dist_base,
u64 redist_stride,
struct fwnode_handle *handle)
- struct device_node *node;
u32 typer;
int gic_irqs;
int err;
@@ -952,10 +951,9 @@ static int __init gic_init_bases(void __iomem *dist_base,
- node = to_of_node(handle);
if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis() &&
- node) /* Temp hack to prevent ITS init for ACPI */
- its_init(node, &gic_data.rdists, gic_data.domain);
+ to_of_node(handle)) /* Temp hack to prevent ITS init for ACPI */
+ its_init(handle, &gic_data.rdists, gic_data.domain);