The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 45453df7f69b0157a14478f635c99216821faeee
Gitweb: https://git.kernel.org/tip/45453df7f69b0157a14478f635c99216821faeee
Author: Alexey Charkov <alchark@gmail.com>
AuthorDate: Tue, 06 May 2025 16:46:15 +04:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 06 May 2025 15:58:26 +02:00
irqchip/irq-vt8500: Drop redundant copy of the device node pointer
Inside vt8500_irq_init(), np is the same as node. Drop it.
Signed-off-by: Alexey Charkov <alchark@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250506-vt8500-intc-updates-v2-2-a3a0606cf92d@gmail.com
---
drivers/irqchip/irq-vt8500.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c
index 9fb9d37..c88aa64 100644
--- a/drivers/irqchip/irq-vt8500.c
+++ b/drivers/irqchip/irq-vt8500.c
@@ -191,7 +191,6 @@ static int __init vt8500_irq_init(struct device_node *node,
struct device_node *parent)
{
int irq, i;
- struct device_node *np = node;
if (active_cnt == VT8500_INTC_MAX) {
pr_err("%s: Interrupt controllers > VT8500_INTC_MAX\n",
@@ -199,7 +198,7 @@ static int __init vt8500_irq_init(struct device_node *node,
goto out;
}
- intc[active_cnt].base = of_iomap(np, 0);
+ intc[active_cnt].base = of_iomap(node, 0);
intc[active_cnt].domain = irq_domain_add_linear(node, 64,
&vt8500_irq_domain_ops, &intc[active_cnt]);
@@ -222,16 +221,16 @@ static int __init vt8500_irq_init(struct device_node *node,
active_cnt++;
/* check if this is a slaved controller */
- if (of_irq_count(np) != 0) {
+ if (of_irq_count(node) != 0) {
/* check that we have the correct number of interrupts */
- if (of_irq_count(np) != 8) {
+ if (of_irq_count(node) != 8) {
pr_err("%s: Incorrect IRQ map for slaved controller\n",
__func__);
return -EINVAL;
}
for (i = 0; i < 8; i++) {
- irq = irq_of_parse_and_map(np, i);
+ irq = irq_of_parse_and_map(node, i);
enable_irq(irq);
}