summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-ti-sci-inta.c
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-10-10 14:23:26 +0300
committerMarc Zyngier <maz@kernel.org>2020-10-10 14:23:26 +0300
commitdde5cfffd68a755151caf449b3870e4120cbc9c7 (patch)
treec5d03961d90d8337f14da425372af47e58f15a12 /drivers/irqchip/irq-ti-sci-inta.c
parent408f110ef6974b336cc0958bf123f5234f583869 (diff)
parent1d1e5630de78f7253ac24b92cee6427c3ff04d56 (diff)
downloadlinux-dde5cfffd68a755151caf449b3870e4120cbc9c7.tar.xz
Merge branch 'irq/irqchip-fixes' into irq/irqchip-next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers/irqchip/irq-ti-sci-inta.c')
-rw-r--r--drivers/irqchip/irq-ti-sci-inta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index bc863ef7998d..e0cceb81c648 100644
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -175,8 +175,8 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
struct irq_fwspec parent_fwspec;
struct device_node *parent_node;
unsigned int parent_virq;
- u16 vint_id, p_hwirq;
- int ret;
+ int p_hwirq, ret;
+ u16 vint_id;
vint_id = ti_sci_get_free_resource(inta->vint);
if (vint_id == TI_SCI_RESOURCE_NULL)