Skip to content

Commit f9c75bc

Browse files
TinyWindzzMarc Zyngier
authored andcommitted
irqchhip: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
1 parent ed01edc commit f9c75bc

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

drivers/irqchip/irq-mscc-ocelot.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ static int __init ocelot_irq_init(struct device_node *node,
7272
domain = irq_domain_add_linear(node, OCELOT_NR_IRQ,
7373
&irq_generic_chip_ops, NULL);
7474
if (!domain) {
75-
pr_err("%s: unable to add irq domain\n", node->name);
75+
pr_err("%pOFn: unable to add irq domain\n", node);
7676
return -ENOMEM;
7777
}
7878

7979
ret = irq_alloc_domain_generic_chips(domain, OCELOT_NR_IRQ, 1,
8080
"icpu", handle_level_irq,
8181
0, 0, 0);
8282
if (ret) {
83-
pr_err("%s: unable to alloc irq domain gc\n", node->name);
83+
pr_err("%pOFn: unable to alloc irq domain gc\n", node);
8484
goto err_domain_remove;
8585
}
8686

8787
gc = irq_get_domain_generic_chip(domain, 0);
8888
gc->reg_base = of_iomap(node, 0);
8989
if (!gc->reg_base) {
90-
pr_err("%s: unable to map resource\n", node->name);
90+
pr_err("%pOFn: unable to map resource\n", node);
9191
ret = -ENOMEM;
9292
goto err_gc_free;
9393
}

drivers/irqchip/irq-stm32-exti.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,
678678
domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK,
679679
&irq_exti_domain_ops, NULL);
680680
if (!domain) {
681-
pr_err("%s: Could not register interrupt domain.\n",
682-
node->name);
681+
pr_err("%pOFn: Could not register interrupt domain.\n",
682+
node);
683683
ret = -ENOMEM;
684684
goto out_unmap;
685685
}
@@ -768,7 +768,7 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data,
768768
host_data);
769769

770770
if (!domain) {
771-
pr_err("%s: Could not register exti domain.\n", node->name);
771+
pr_err("%pOFn: Could not register exti domain.\n", node);
772772
ret = -ENOMEM;
773773
goto out_unmap;
774774
}

drivers/irqchip/irq-tango.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,24 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
184184

185185
irq = irq_of_parse_and_map(node, 0);
186186
if (!irq)
187-
panic("%s: failed to get IRQ", node->name);
187+
panic("%pOFn: failed to get IRQ", node);
188188

189189
err = of_address_to_resource(node, 0, &res);
190190
if (err)
191-
panic("%s: failed to get address", node->name);
191+
panic("%pOFn: failed to get address", node);
192192

193193
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
194194
chip->ctl = res.start - baseres->start;
195195
chip->base = base;
196196

197197
dom = irq_domain_add_linear(node, 64, &irq_generic_chip_ops, chip);
198198
if (!dom)
199-
panic("%s: failed to create irqdomain", node->name);
199+
panic("%pOFn: failed to create irqdomain", node);
200200

201201
err = irq_alloc_domain_generic_chips(dom, 32, 2, node->name,
202202
handle_level_irq, 0, 0, 0);
203203
if (err)
204-
panic("%s: failed to allocate irqchip", node->name);
204+
panic("%pOFn: failed to allocate irqchip", node);
205205

206206
tangox_irq_domain_init(dom);
207207

@@ -219,7 +219,7 @@ static int __init tangox_of_irq_init(struct device_node *node,
219219

220220
base = of_iomap(node, 0);
221221
if (!base)
222-
panic("%s: of_iomap failed", node->name);
222+
panic("%pOFn: of_iomap failed", node);
223223

224224
of_address_to_resource(node, 0, &res);
225225

0 commit comments

Comments
 (0)