From: Rob Herring <robh@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] irqchip: Convert to using %pOFn instead of device_node.name
Date: Mon, 27 Aug 2018 20:52:25 -0500 [thread overview]
Message-ID: <20180828015252.28511-24-robh@kernel.org> (raw)
In-Reply-To: <20180828015252.28511-1-robh@kernel.org>
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/irqchip/irq-gic-v3.c | 4 ++--
drivers/irqchip/irq-mscc-ocelot.c | 6 +++---
drivers/irqchip/irq-orion.c | 22 +++++++++++-----------
drivers/irqchip/irq-stm32-exti.c | 6 +++---
drivers/irqchip/irq-tango.c | 10 +++++-----
drivers/irqchip/irq-tb10x.c | 18 +++++++++---------
6 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index d5912f1ec884..fcb6227ff5ac 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1183,8 +1183,8 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
part->partition_id = of_node_to_fwnode(child_part);
- pr_info("GIC: PPI partition %s[%d] { ",
- child_part->name, part_idx);
+ pr_info("GIC: PPI partition %pOFn[%d] { ",
+ child_part, part_idx);
n = of_property_count_elems_of_size(child_part, "affinity",
sizeof(u32));
diff --git a/drivers/irqchip/irq-mscc-ocelot.c b/drivers/irqchip/irq-mscc-ocelot.c
index b63e40c00a02..88143c0b700c 100644
--- a/drivers/irqchip/irq-mscc-ocelot.c
+++ b/drivers/irqchip/irq-mscc-ocelot.c
@@ -72,7 +72,7 @@ static int __init ocelot_irq_init(struct device_node *node,
domain = irq_domain_add_linear(node, OCELOT_NR_IRQ,
&irq_generic_chip_ops, NULL);
if (!domain) {
- pr_err("%s: unable to add irq domain\n", node->name);
+ pr_err("%pOFn: unable to add irq domain\n", node);
return -ENOMEM;
}
@@ -80,14 +80,14 @@ static int __init ocelot_irq_init(struct device_node *node,
"icpu", handle_level_irq,
0, 0, 0);
if (ret) {
- pr_err("%s: unable to alloc irq domain gc\n", node->name);
+ pr_err("%pOFn: unable to alloc irq domain gc\n", node);
goto err_domain_remove;
}
gc = irq_get_domain_generic_chip(domain, 0);
gc->reg_base = of_iomap(node, 0);
if (!gc->reg_base) {
- pr_err("%s: unable to map resource\n", node->name);
+ pr_err("%pOFn: unable to map resource\n", node);
ret = -ENOMEM;
goto err_gc_free;
}
diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c
index be4c5a8c9659..c4b5ffb61954 100644
--- a/drivers/irqchip/irq-orion.c
+++ b/drivers/irqchip/irq-orion.c
@@ -64,14 +64,14 @@ static int __init orion_irq_init(struct device_node *np,
num_chips * ORION_IRQS_PER_CHIP,
&irq_generic_chip_ops, NULL);
if (!orion_irq_domain)
- panic("%s: unable to add irq domain\n", np->name);
+ panic("%pOFn: unable to add irq domain\n", np);
ret = irq_alloc_domain_generic_chips(orion_irq_domain,
- ORION_IRQS_PER_CHIP, 1, np->name,
+ ORION_IRQS_PER_CHIP, 1, np->full_name,
handle_level_irq, clr, 0,
IRQ_GC_INIT_MASK_CACHE);
if (ret)
- panic("%s: unable to alloc irq domain gc\n", np->name);
+ panic("%pOFn: unable to alloc irq domain gc\n", np);
for (n = 0, base = 0; n < num_chips; n++, base += ORION_IRQS_PER_CHIP) {
struct irq_chip_generic *gc =
@@ -80,12 +80,12 @@ static int __init orion_irq_init(struct device_node *np,
of_address_to_resource(np, n, &r);
if (!request_mem_region(r.start, resource_size(&r), np->name))
- panic("%s: unable to request mem region %d",
- np->name, n);
+ panic("%pOFn: unable to request mem region %d",
+ np, n);
gc->reg_base = ioremap(r.start, resource_size(&r));
if (!gc->reg_base)
- panic("%s: unable to map resource %d", np->name, n);
+ panic("%pOFn: unable to map resource %d", np, n);
gc->chip_types[0].regs.mask = ORION_IRQ_MASK;
gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit;
@@ -150,20 +150,20 @@ static int __init orion_bridge_irq_init(struct device_node *np,
domain = irq_domain_add_linear(np, nrirqs,
&irq_generic_chip_ops, NULL);
if (!domain) {
- pr_err("%s: unable to add irq domain\n", np->name);
+ pr_err("%pOFn: unable to add irq domain\n", np);
return -ENOMEM;
}
ret = irq_alloc_domain_generic_chips(domain, nrirqs, 1, np->name,
handle_edge_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE);
if (ret) {
- pr_err("%s: unable to alloc irq domain gc\n", np->name);
+ pr_err("%pOFn: unable to alloc irq domain gc\n", np);
return ret;
}
ret = of_address_to_resource(np, 0, &r);
if (ret) {
- pr_err("%s: unable to get resource\n", np->name);
+ pr_err("%pOFn: unable to get resource\n", np);
return ret;
}
@@ -175,14 +175,14 @@ static int __init orion_bridge_irq_init(struct device_node *np,
/* Map the parent interrupt for the chained handler */
irq = irq_of_parse_and_map(np, 0);
if (irq <= 0) {
- pr_err("%s: unable to parse irq\n", np->name);
+ pr_err("%pOFn: unable to parse irq\n", np);
return -EINVAL;
}
gc = irq_get_domain_generic_chip(domain, 0);
gc->reg_base = ioremap(r.start, resource_size(&r));
if (!gc->reg_base) {
- pr_err("%s: unable to map resource\n", np->name);
+ pr_err("%pOFn: unable to map resource\n", np);
return -ENOMEM;
}
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
index 0a2088e12d96..363385750fa7 100644
--- a/drivers/irqchip/irq-stm32-exti.c
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -678,8 +678,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,
domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK,
&irq_exti_domain_ops, NULL);
if (!domain) {
- pr_err("%s: Could not register interrupt domain.\n",
- node->name);
+ pr_err("%pOFn: Could not register interrupt domain.\n",
+ node);
ret = -ENOMEM;
goto out_unmap;
}
@@ -768,7 +768,7 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data,
host_data);
if (!domain) {
- pr_err("%s: Could not register exti domain.\n", node->name);
+ pr_err("%pOFn: Could not register exti domain.\n", node);
ret = -ENOMEM;
goto out_unmap;
}
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c
index 580e2d72b9ba..ae28d8648679 100644
--- a/drivers/irqchip/irq-tango.c
+++ b/drivers/irqchip/irq-tango.c
@@ -184,11 +184,11 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
irq = irq_of_parse_and_map(node, 0);
if (!irq)
- panic("%s: failed to get IRQ", node->name);
+ panic("%pOFn: failed to get IRQ", node);
err = of_address_to_resource(node, 0, &res);
if (err)
- panic("%s: failed to get address", node->name);
+ panic("%pOFn: failed to get address", node);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
chip->ctl = res.start - baseres->start;
@@ -196,12 +196,12 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
dom = irq_domain_add_linear(node, 64, &irq_generic_chip_ops, chip);
if (!dom)
- panic("%s: failed to create irqdomain", node->name);
+ panic("%pOFn: failed to create irqdomain", node);
err = irq_alloc_domain_generic_chips(dom, 32, 2, node->name,
handle_level_irq, 0, 0, 0);
if (err)
- panic("%s: failed to allocate irqchip", node->name);
+ panic("%pOFn: failed to allocate irqchip", node);
tangox_irq_domain_init(dom);
@@ -219,7 +219,7 @@ static int __init tangox_of_irq_init(struct device_node *node,
base = of_iomap(node, 0);
if (!base)
- panic("%s: of_iomap failed", node->name);
+ panic("%pOFn: of_iomap failed", node);
of_address_to_resource(node, 0, &res);
diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c
index 848d782a2a3b..7e6708099a7b 100644
--- a/drivers/irqchip/irq-tb10x.c
+++ b/drivers/irqchip/irq-tb10x.c
@@ -115,21 +115,21 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
void __iomem *reg_base;
if (of_address_to_resource(ictl, 0, &mem)) {
- pr_err("%s: No registers declared in DeviceTree.\n",
- ictl->name);
+ pr_err("%pOFn: No registers declared in DeviceTree.\n",
+ ictl);
return -EINVAL;
}
if (!request_mem_region(mem.start, resource_size(&mem),
- ictl->name)) {
- pr_err("%s: Request mem region failed.\n", ictl->name);
+ ictl->full_name)) {
+ pr_err("%pOFn: Request mem region failed.\n", ictl);
return -EBUSY;
}
reg_base = ioremap(mem.start, resource_size(&mem));
if (!reg_base) {
ret = -EBUSY;
- pr_err("%s: ioremap failed.\n", ictl->name);
+ pr_err("%pOFn: ioremap failed.\n", ictl);
goto ioremap_fail;
}
@@ -137,8 +137,8 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
&irq_generic_chip_ops, NULL);
if (!domain) {
ret = -ENOMEM;
- pr_err("%s: Could not register interrupt domain.\n",
- ictl->name);
+ pr_err("%pOFn: Could not register interrupt domain.\n",
+ ictl);
goto irq_domain_add_fail;
}
@@ -147,8 +147,8 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
IRQ_NOREQUEST, IRQ_NOPROBE,
IRQ_GC_INIT_MASK_CACHE);
if (ret) {
- pr_err("%s: Could not allocate generic interrupt chip.\n",
- ictl->name);
+ pr_err("%pOFn: Could not allocate generic interrupt chip.\n",
+ ictl);
goto gc_alloc_fail;
}
--
2.17.1
next prev parent reply other threads:[~2018-08-28 1:54 UTC|newest]
Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 1:52 [PATCH] ARM: omap: Convert to using %pOFn instead of device_node.name Rob Herring
2018-08-28 1:52 ` [PATCH] ARM: shmobile: " Rob Herring
2018-08-28 7:24 ` Geert Uytterhoeven
2018-08-30 14:37 ` Simon Horman
2018-08-28 1:52 ` [PATCH] ARM: zynq: " Rob Herring
2018-09-05 13:27 ` Michal Simek
2018-08-28 1:52 ` [PATCH] MIPS: " Rob Herring
2018-08-28 16:54 ` Paul Burton
2018-08-28 1:52 ` [PATCH] nios2: " Rob Herring
2018-08-28 15:47 ` Ley Foon Tan
2018-08-28 1:52 ` [PATCH] powerpc: " Rob Herring
2018-10-04 6:14 ` Michael Ellerman
2018-08-28 1:52 ` [PATCH] sparc: " Rob Herring
2018-08-28 14:13 ` Rob Herring
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-10-08 5:57 ` David Miller
2018-08-28 1:52 ` [PATCH] xtensa: " Rob Herring
2018-08-28 15:45 ` Max Filippov
2018-08-28 1:52 ` [PATCH] ata: ahci: " Rob Herring
2018-08-28 14:44 ` Jens Axboe
2018-08-28 1:52 ` [PATCH] bus: fsl-mc: " Rob Herring
2018-08-28 1:52 ` [PATCH] bus: mvebu-mbus: " Rob Herring
2018-08-28 1:52 ` [PATCH] clk: " Rob Herring
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-08-28 22:15 ` Stephen Boyd
2018-08-29 11:13 ` Rob Herring
2018-08-30 16:50 ` Stephen Boyd
2018-09-03 5:29 ` [PATCH] " Chen-Yu Tsai
2018-09-07 15:08 ` Rob Herring
2018-08-28 1:52 ` [PATCH] clocksource: " Rob Herring
2018-08-29 15:23 ` Daniel Lezcano
2018-08-28 1:52 ` [PATCH] cpufreq: " Rob Herring
2018-09-03 6:34 ` Viresh Kumar
2018-09-14 8:27 ` Rafael J. Wysocki
2018-08-28 1:52 ` [PATCH] devfreq: " Rob Herring
2018-08-28 2:06 ` Chanwoo Choi
[not found] ` <CGME20180828015312epcas2p2fdb2ee1d1b292f212ec773dd8fb4bfc7@epcms1p8>
2018-08-29 2:10 ` MyungJoo Ham
2018-08-28 1:52 ` [PATCH] dmaengine: " Rob Herring
2018-08-28 5:16 ` Vinod
2018-08-28 1:52 ` [PATCH] firmware: " Rob Herring
2018-09-28 21:47 ` Rob Herring
2018-10-01 9:09 ` Sudeep Holla
2018-08-28 1:52 ` [PATCH] gpio: " Rob Herring
2018-08-29 12:02 ` Linus Walleij
2018-08-28 1:52 ` [PATCH] drm: " Rob Herring
2018-08-28 12:54 ` Maarten Lankhorst
2018-08-28 15:04 ` Rob Herring
2018-08-28 15:04 ` Rob Clark
2018-08-28 1:52 ` [PATCH] hwmon: " Rob Herring
2018-08-28 13:57 ` Guenter Roeck
2018-08-28 15:11 ` Rob Herring
2018-08-28 18:43 ` Guenter Roeck
2018-08-28 1:52 ` [PATCH] i2c: " Rob Herring
2018-08-28 6:33 ` Peter Rosin
2018-08-29 18:42 ` Rob Herring
2018-08-29 19:52 ` Peter Rosin
2018-08-30 0:49 ` Rob Herring
2018-08-28 1:52 ` [PATCH] iio: " Rob Herring
2018-09-02 17:55 ` Jonathan Cameron
2018-08-28 1:52 ` [PATCH] input: sun4i-lradc: " Rob Herring
2018-09-28 21:54 ` Rob Herring
2018-09-28 23:59 ` Dmitry Torokhov
2018-08-28 1:52 ` Rob Herring [this message]
2018-09-08 12:15 ` [PATCH] irqchip: " Thomas Gleixner
2018-09-10 13:55 ` Rob Herring
2018-08-28 1:52 ` [PATCH] leds: " Rob Herring
2018-08-28 11:07 ` Sakari Ailus
2018-08-28 11:37 ` Pavel Machek
2018-08-28 20:37 ` Jacek Anaszewski
2018-08-28 1:52 ` [PATCH] macintosh: " Rob Herring
2018-08-28 1:52 ` [PATCH] mailbox: " Rob Herring
2018-09-28 21:54 ` Rob Herring
2018-08-28 1:52 ` [PATCH] media: " Rob Herring
2018-08-28 10:06 ` Laurent Pinchart
2018-08-28 12:21 ` Rob Herring
2018-09-12 15:10 ` Mauro Carvalho Chehab
2018-08-28 1:52 ` [PATCH] memory: " Rob Herring
2018-08-28 10:42 ` Thierry Reding
2018-08-28 15:33 ` Tony Lindgren
2018-08-29 7:44 ` Krzysztof Kozlowski
2018-08-28 1:52 ` [PATCH] mfd: max77620: " Rob Herring
2018-09-10 15:24 ` Lee Jones
2018-08-28 1:52 ` [PATCH] misc: " Rob Herring
2018-08-28 2:35 ` Andrew Donnellan
2018-08-28 1:52 ` [PATCH] mmc: " Rob Herring
2018-08-28 7:59 ` Adrian Hunter
2018-08-28 11:41 ` Ulf Hansson
2018-08-28 1:52 ` [PATCH] mtd: rawnand: " Rob Herring
2018-08-28 9:16 ` Boris Brezillon
2018-09-04 21:58 ` Miquel Raynal
2018-08-28 1:52 ` [PATCH] net: ethernet: " Rob Herring
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-08-28 15:45 ` Matthias Brugger
2018-08-29 2:06 ` Sean Wang
2018-08-30 2:41 ` David Miller
2018-08-28 1:52 ` [PATCH] net: phy: " Rob Herring
2018-08-28 16:57 ` Florian Fainelli
2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring
2018-08-28 11:19 ` Kalle Valo
2018-09-03 16:58 ` Kalle Valo
2018-08-28 1:52 ` [PATCH] nvmem: " Rob Herring
2018-09-28 22:06 ` Rob Herring
2018-10-01 9:05 ` Srinivas Kandagatla
2018-08-28 1:52 ` [PATCH] perf: " Rob Herring
2018-08-28 17:02 ` Will Deacon
2018-09-28 21:19 ` Rob Herring
2018-10-01 9:18 ` Will Deacon
2018-08-28 1:52 ` [PATCH] phy: " Rob Herring
2018-09-04 2:24 ` Kishon Vijay Abraham I
2018-09-04 14:21 ` Rob Herring
2018-08-28 1:52 ` [PATCH] pinctrl: " Rob Herring
2018-08-28 1:57 ` A.s. Dong
2018-08-28 7:21 ` Alexandre Belloni
2018-08-28 15:34 ` Tony Lindgren
2018-08-29 2:13 ` Sean Wang
2018-08-29 2:15 ` Chen-Yu Tsai
2018-08-29 8:31 ` Heiko Stübner
2018-08-29 12:07 ` Linus Walleij
2018-09-03 9:57 ` Patrice CHOTARD
2018-08-28 1:52 ` [PATCH] regulator: " Rob Herring
2018-08-29 7:47 ` Krzysztof Kozlowski
2018-08-28 1:52 ` [PATCH] rpmsg: " Rob Herring
2018-08-28 3:08 ` Bjorn Andersson
2018-08-28 1:52 ` [PATCH] soc: " Rob Herring
2018-08-28 10:44 ` Thierry Reding
2018-08-28 18:48 ` Li Yang
2018-08-28 22:14 ` Tyrel Datwyler
2018-08-28 22:29 ` Li Yang
2018-08-28 22:46 ` Tyrel Datwyler
2018-08-29 8:21 ` Heiko Stübner
2018-08-29 8:57 ` Qiang Zhao
2018-09-30 17:08 ` Andy Gross
2018-08-28 1:52 ` [PATCH] staging: " Rob Herring
2018-08-28 6:34 ` Ian Arkver
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-09-12 15:17 ` Mauro Carvalho Chehab
2018-09-12 20:26 ` Rob Herring
2018-09-12 21:07 ` Mauro Carvalho Chehab
2018-09-12 22:48 ` Rob Herring
2018-09-13 11:50 ` Joe Perches
2018-09-13 21:26 ` Rob Herring
2018-09-14 11:41 ` Joe Perches
2018-08-28 1:52 ` [PATCH] thermal: " Rob Herring
2018-08-30 14:58 ` Daniel Lezcano
2018-08-28 1:52 ` [PATCH] tty: " Rob Herring
2018-09-28 22:09 ` Rob Herring
2018-09-28 22:32 ` Rob Herring
2018-08-28 1:52 ` [PATCH] uio: " Rob Herring
2018-08-28 1:52 ` [PATCH] backlight: pm8941: " Rob Herring
2018-08-28 1:52 ` [PATCH] fbdev: " Rob Herring
2018-09-28 22:11 ` Rob Herring
2018-10-08 10:41 ` Bartlomiej Zolnierkiewicz
2018-08-28 1:52 ` [PATCH] sound: " Rob Herring
2018-08-28 7:54 ` Andy Shevchenko
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-09-03 21:45 ` [alsa-devel] " Takashi Iwai
2018-08-28 1:52 ` [PATCH] ASoC: " Rob Herring
2018-08-28 7:57 ` Andy Shevchenko
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-08-28 18:03 ` Mark Brown
2018-08-28 6:55 ` [PATCH] ARM: omap: " Joe Perches
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-09-07 17:14 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180828015252.28511-24-robh@kernel.org \
--to=robh@kernel.org \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).