Skip to content

Commit e81f54c

Browse files
robherringMarc Zyngier
robherring
authored and
Marc Zyngier
committed
irqchip: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Lee Jones <lee@kernel.org> Cc: Stefan Wahren <stefan.wahren@i2se.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: bcm-kernel-feedback-list@broadcom.com Cc: Sylvain Lemieux <slemieux.tyco@gmail.com> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com> Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org Cc: linux-tegra@vger.kernel.org Acked-by: Eric Anholt <eric@anholt.net> Acked-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Acked-by: Alexandre Torgue <alexandre.torgue@st.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
1 parent 5ed34d3 commit e81f54c

16 files changed

+50
-56
lines changed

‎drivers/irqchip/irq-bcm2835.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,12 @@ static int __init armctrl_of_init(struct device_node *node,
147147

148148
base = of_iomap(node, 0);
149149
if (!base)
150-
panic("%s: unable to map IC registers\n",
151-
node->full_name);
150+
panic("%pOF: unable to map IC registers\n", node);
152151

153152
intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0),
154153
&armctrl_ops, NULL);
155154
if (!intc.domain)
156-
panic("%s: unable to create IRQ domain\n", node->full_name);
155+
panic("%pOF: unable to create IRQ domain\n", node);
157156

158157
for (b = 0; b < NR_BANKS; b++) {
159158
intc.pending[b] = base + reg_pending[b];
@@ -173,8 +172,8 @@ static int __init armctrl_of_init(struct device_node *node,
173172
int parent_irq = irq_of_parse_and_map(node, 0);
174173

175174
if (!parent_irq) {
176-
panic("%s: unable to get parent interrupt.\n",
177-
node->full_name);
175+
panic("%pOF: unable to get parent interrupt.\n",
176+
node);
178177
}
179178
irq_set_chained_handler(parent_irq, bcm2836_chained_handle_irq);
180179
} else {

‎drivers/irqchip/irq-bcm2836.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,
282282
{
283283
intc.base = of_iomap(node, 0);
284284
if (!intc.base) {
285-
panic("%s: unable to map local interrupt registers\n",
286-
node->full_name);
285+
panic("%pOF: unable to map local interrupt registers\n", node);
287286
}
288287

289288
bcm2835_init_local_timer_frequency();
@@ -292,7 +291,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node,
292291
&bcm2836_arm_irqchip_intc_ops,
293292
NULL);
294293
if (!intc.domain)
295-
panic("%s: unable to create IRQ domain\n", node->full_name);
294+
panic("%pOF: unable to create IRQ domain\n", node);
296295

297296
bcm2836_arm_irqchip_register_irq(LOCAL_IRQ_CNTPSIRQ,
298297
&bcm2836_arm_irqchip_timer);

‎drivers/irqchip/irq-crossbar.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ static int __init irqcrossbar_init(struct device_node *node,
341341
int err;
342342

343343
if (!parent) {
344-
pr_err("%s: no parent, giving up\n", node->full_name);
344+
pr_err("%pOF: no parent, giving up\n", node);
345345
return -ENODEV;
346346
}
347347

348348
parent_domain = irq_find_host(parent);
349349
if (!parent_domain) {
350-
pr_err("%s: unable to obtain parent domain\n", node->full_name);
350+
pr_err("%pOF: unable to obtain parent domain\n", node);
351351
return -ENXIO;
352352
}
353353

@@ -360,7 +360,7 @@ static int __init irqcrossbar_init(struct device_node *node,
360360
node, &crossbar_domain_ops,
361361
NULL);
362362
if (!domain) {
363-
pr_err("%s: failed to allocated domain\n", node->full_name);
363+
pr_err("%pOF: failed to allocated domain\n", node);
364364
return -ENOMEM;
365365
}
366366

‎drivers/irqchip/irq-digicolor.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static int __init digicolor_of_init(struct device_node *node,
7878

7979
reg_base = of_iomap(node, 0);
8080
if (!reg_base) {
81-
pr_err("%s: unable to map IC registers\n", node->full_name);
81+
pr_err("%pOF: unable to map IC registers\n", node);
8282
return -ENXIO;
8383
}
8484

@@ -88,7 +88,7 @@ static int __init digicolor_of_init(struct device_node *node,
8888

8989
ucregs = syscon_regmap_lookup_by_phandle(node, "syscon");
9090
if (IS_ERR(ucregs)) {
91-
pr_err("%s: unable to map UC registers\n", node->full_name);
91+
pr_err("%pOF: unable to map UC registers\n", node);
9292
return PTR_ERR(ucregs);
9393
}
9494
/* channel 1, regular IRQs */
@@ -97,15 +97,15 @@ static int __init digicolor_of_init(struct device_node *node,
9797
digicolor_irq_domain =
9898
irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL);
9999
if (!digicolor_irq_domain) {
100-
pr_err("%s: unable to create IRQ domain\n", node->full_name);
100+
pr_err("%pOF: unable to create IRQ domain\n", node);
101101
return -ENOMEM;
102102
}
103103

104104
ret = irq_alloc_domain_generic_chips(digicolor_irq_domain, 32, 1,
105105
"digicolor_irq", handle_level_irq,
106106
clr, 0, 0);
107107
if (ret) {
108-
pr_err("%s: unable to allocate IRQ gc\n", node->full_name);
108+
pr_err("%pOF: unable to allocate IRQ gc\n", node);
109109
return ret;
110110
}
111111

‎drivers/irqchip/irq-dw-apb-ictl.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,24 @@ static int __init dw_apb_ictl_init(struct device_node *np,
7979
/* Map the parent interrupt for the chained handler */
8080
irq = irq_of_parse_and_map(np, 0);
8181
if (irq <= 0) {
82-
pr_err("%s: unable to parse irq\n", np->full_name);
82+
pr_err("%pOF: unable to parse irq\n", np);
8383
return -EINVAL;
8484
}
8585

8686
ret = of_address_to_resource(np, 0, &r);
8787
if (ret) {
88-
pr_err("%s: unable to get resource\n", np->full_name);
88+
pr_err("%pOF: unable to get resource\n", np);
8989
return ret;
9090
}
9191

9292
if (!request_mem_region(r.start, resource_size(&r), np->full_name)) {
93-
pr_err("%s: unable to request mem region\n", np->full_name);
93+
pr_err("%pOF: unable to request mem region\n", np);
9494
return -ENOMEM;
9595
}
9696

9797
iobase = ioremap(r.start, resource_size(&r));
9898
if (!iobase) {
99-
pr_err("%s: unable to map resource\n", np->full_name);
99+
pr_err("%pOF: unable to map resource\n", np);
100100
ret = -ENOMEM;
101101
goto err_release;
102102
}
@@ -123,7 +123,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,
123123
domain = irq_domain_add_linear(np, nrirqs,
124124
&irq_generic_chip_ops, NULL);
125125
if (!domain) {
126-
pr_err("%s: unable to add irq domain\n", np->full_name);
126+
pr_err("%pOF: unable to add irq domain\n", np);
127127
ret = -ENOMEM;
128128
goto err_unmap;
129129
}
@@ -132,7 +132,7 @@ static int __init dw_apb_ictl_init(struct device_node *np,
132132
handle_level_irq, clr, 0,
133133
IRQ_GC_INIT_MASK_CACHE);
134134
if (ret) {
135-
pr_err("%s: unable to alloc irq domain gc\n", np->full_name);
135+
pr_err("%pOF: unable to alloc irq domain gc\n", np);
136136
goto err_unmap;
137137
}
138138

‎drivers/irqchip/irq-gic-v3-its-pci-msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static int __init its_pci_of_msi_init(void)
138138
if (its_pci_msi_init_one(of_node_to_fwnode(np), np->full_name))
139139
continue;
140140

141-
pr_info("PCI/MSI: %s domain created\n", np->full_name);
141+
pr_info("PCI/MSI: %pOF domain created\n", np);
142142
}
143143

144144
return 0;

‎drivers/irqchip/irq-gic-v3-its.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,13 +1822,13 @@ static int __init its_of_probe(struct device_node *node)
18221822
for (np = of_find_matching_node(node, its_device_id); np;
18231823
np = of_find_matching_node(np, its_device_id)) {
18241824
if (!of_property_read_bool(np, "msi-controller")) {
1825-
pr_warn("%s: no msi-controller property, ITS ignored\n",
1826-
np->full_name);
1825+
pr_warn("%pOF: no msi-controller property, ITS ignored\n",
1826+
np);
18271827
continue;
18281828
}
18291829

18301830
if (of_address_to_resource(np, 0, &res)) {
1831-
pr_warn("%s: no regs?\n", np->full_name);
1831+
pr_warn("%pOF: no regs?\n", np);
18321832
continue;
18331833
}
18341834

‎drivers/irqchip/irq-gic-v3.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
10571057
if (WARN_ON(cpu == -1))
10581058
continue;
10591059

1060-
pr_cont("%s[%d] ", cpu_node->full_name, cpu);
1060+
pr_cont("%pOF[%d] ", cpu_node, cpu);
10611061

10621062
cpumask_set_cpu(cpu, &part->mask);
10631063
}
@@ -1125,15 +1125,13 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare
11251125

11261126
dist_base = of_iomap(node, 0);
11271127
if (!dist_base) {
1128-
pr_err("%s: unable to map gic dist registers\n",
1129-
node->full_name);
1128+
pr_err("%pOF: unable to map gic dist registers\n", node);
11301129
return -ENXIO;
11311130
}
11321131

11331132
err = gic_validate_dist_version(dist_base);
11341133
if (err) {
1135-
pr_err("%s: no distributor detected, giving up\n",
1136-
node->full_name);
1134+
pr_err("%pOF: no distributor detected, giving up\n", node);
11371135
goto out_unmap_dist;
11381136
}
11391137

@@ -1153,8 +1151,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare
11531151
ret = of_address_to_resource(node, 1 + i, &res);
11541152
rdist_regs[i].redist_base = of_iomap(node, 1 + i);
11551153
if (ret || !rdist_regs[i].redist_base) {
1156-
pr_err("%s: couldn't map region %d\n",
1157-
node->full_name, i);
1154+
pr_err("%pOF: couldn't map region %d\n", node, i);
11581155
err = -ENODEV;
11591156
goto out_unmap_rdist;
11601157
}

‎drivers/irqchip/irq-imx-gpcv2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,
214214
int i;
215215

216216
if (!parent) {
217-
pr_err("%s: no parent, giving up\n", node->full_name);
217+
pr_err("%pOF: no parent, giving up\n", node);
218218
return -ENODEV;
219219
}
220220

221221
parent_domain = irq_find_host(parent);
222222
if (!parent_domain) {
223-
pr_err("%s: unable to get parent domain\n", node->full_name);
223+
pr_err("%pOF: unable to get parent domain\n", node);
224224
return -ENXIO;
225225
}
226226

‎drivers/irqchip/irq-lpc32xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node,
191191

192192
irqc->base = of_iomap(node, 0);
193193
if (!irqc->base) {
194-
pr_err("%s: unable to map registers\n", node->full_name);
194+
pr_err("%pOF: unable to map registers\n", node);
195195
kfree(irqc);
196196
return -EINVAL;
197197
}

‎drivers/irqchip/irq-mtk-sysirq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
178178
chip_data->intpol_words[i] = size / 4;
179179
chip_data->intpol_bases[i] = of_iomap(node, i);
180180
if (ret || !chip_data->intpol_bases[i]) {
181-
pr_err("%s: couldn't map region %d\n",
182-
node->full_name, i);
181+
pr_err("%pOF: couldn't map region %d\n", node, i);
183182
ret = -ENODEV;
184183
goto out_free_intpol;
185184
}

‎drivers/irqchip/irq-mxs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static void __init icoll_add_domain(struct device_node *np,
179179
&icoll_irq_domain_ops, NULL);
180180

181181
if (!icoll_domain)
182-
panic("%s: unable to create irq domain", np->full_name);
182+
panic("%pOF: unable to create irq domain", np);
183183
}
184184

185185
static void __iomem * __init icoll_init_iobase(struct device_node *np)
@@ -188,7 +188,7 @@ static void __iomem * __init icoll_init_iobase(struct device_node *np)
188188

189189
icoll_base = of_io_request_and_map(np, 0, np->name);
190190
if (IS_ERR(icoll_base))
191-
panic("%s: unable to map resource", np->full_name);
191+
panic("%pOF: unable to map resource", np);
192192
return icoll_base;
193193
}
194194

‎drivers/irqchip/irq-stm32-exti.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static int __init stm32_exti_init(struct device_node *node,
140140

141141
base = of_iomap(node, 0);
142142
if (!base) {
143-
pr_err("%s: Unable to map registers\n", node->full_name);
143+
pr_err("%pOF: Unable to map registers\n", node);
144144
return -ENOMEM;
145145
}
146146

@@ -149,7 +149,7 @@ static int __init stm32_exti_init(struct device_node *node,
149149
nr_exti = fls(readl_relaxed(base + EXTI_RTSR));
150150
writel_relaxed(0, base + EXTI_RTSR);
151151

152-
pr_info("%s: %d External IRQs detected\n", node->full_name, nr_exti);
152+
pr_info("%pOF: %d External IRQs detected\n", node, nr_exti);
153153

154154
domain = irq_domain_add_linear(node, nr_exti,
155155
&irq_exti_domain_ops, NULL);
@@ -163,8 +163,8 @@ static int __init stm32_exti_init(struct device_node *node,
163163
ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti",
164164
handle_edge_irq, clr, 0, 0);
165165
if (ret) {
166-
pr_err("%s: Could not allocate generic interrupt chip.\n",
167-
node->full_name);
166+
pr_err("%pOF: Could not allocate generic interrupt chip.\n",
167+
node);
168168
goto out_free_domain;
169169
}
170170

‎drivers/irqchip/irq-sun4i.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ static int __init sun4i_of_init(struct device_node *node,
9797
{
9898
sun4i_irq_base = of_iomap(node, 0);
9999
if (!sun4i_irq_base)
100-
panic("%s: unable to map IC registers\n",
101-
node->full_name);
100+
panic("%pOF: unable to map IC registers\n",
101+
node);
102102

103103
/* Disable all interrupts */
104104
writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(0));
@@ -124,7 +124,7 @@ static int __init sun4i_of_init(struct device_node *node,
124124
sun4i_irq_domain = irq_domain_add_linear(node, 3 * 32,
125125
&sun4i_irq_ops, NULL);
126126
if (!sun4i_irq_domain)
127-
panic("%s: unable to create IRQ domain\n", node->full_name);
127+
panic("%pOF: unable to create IRQ domain\n", node);
128128

129129
set_handle_irq(sun4i_handle_irq);
130130

‎drivers/irqchip/irq-tegra.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,13 @@ static int __init tegra_ictlr_init(struct device_node *node,
291291
int err;
292292

293293
if (!parent) {
294-
pr_err("%s: no parent, giving up\n", node->full_name);
294+
pr_err("%pOF: no parent, giving up\n", node);
295295
return -ENODEV;
296296
}
297297

298298
parent_domain = irq_find_host(parent);
299299
if (!parent_domain) {
300-
pr_err("%s: unable to obtain parent domain\n", node->full_name);
300+
pr_err("%pOF: unable to obtain parent domain\n", node);
301301
return -ENXIO;
302302
}
303303

@@ -329,29 +329,29 @@ static int __init tegra_ictlr_init(struct device_node *node,
329329
}
330330

331331
if (!num_ictlrs) {
332-
pr_err("%s: no valid regions, giving up\n", node->full_name);
332+
pr_err("%pOF: no valid regions, giving up\n", node);
333333
err = -ENOMEM;
334334
goto out_free;
335335
}
336336

337337
WARN(num_ictlrs != soc->num_ictlrs,
338-
"%s: Found %u interrupt controllers in DT; expected %u.\n",
339-
node->full_name, num_ictlrs, soc->num_ictlrs);
338+
"%pOF: Found %u interrupt controllers in DT; expected %u.\n",
339+
node, num_ictlrs, soc->num_ictlrs);
340340

341341

342342
domain = irq_domain_add_hierarchy(parent_domain, 0, num_ictlrs * 32,
343343
node, &tegra_ictlr_domain_ops,
344344
lic);
345345
if (!domain) {
346-
pr_err("%s: failed to allocated domain\n", node->full_name);
346+
pr_err("%pOF: failed to allocated domain\n", node);
347347
err = -ENOMEM;
348348
goto out_unmap;
349349
}
350350

351351
tegra_ictlr_syscore_init();
352352

353-
pr_info("%s: %d interrupts forwarded to %s\n",
354-
node->full_name, num_ictlrs * 32, parent->full_name);
353+
pr_info("%pOF: %d interrupts forwarded to %pOF\n",
354+
node, num_ictlrs * 32, parent);
355355

356356
return 0;
357357

‎drivers/irqchip/irq-xilinx-intc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
186186
if (irqc->intr_mask >> nr_irq)
187187
pr_warn("irq-xilinx: mismatch in kind-of-intr param\n");
188188

189-
pr_info("irq-xilinx: %s: num_irq=%d, edge=0x%x\n",
190-
intc->full_name, nr_irq, irqc->intr_mask);
189+
pr_info("irq-xilinx: %pOF: num_irq=%d, edge=0x%x\n",
190+
intc, nr_irq, irqc->intr_mask);
191191

192192

193193
/*

0 commit comments

Comments
 (0)