From: Rob Herring <robh@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>, sparclinux@vger.kernel.org
Subject: [PATCH] sparc: Convert to using %pOFn instead of device_node.name
Date: Mon, 27 Aug 2018 20:52:08 -0500 [thread overview]
Message-ID: <20180828015252.28511-7-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: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/sparc/kernel/auxio_64.c | 4 +--
arch/sparc/kernel/power.c | 4 +--
arch/sparc/kernel/prom_32.c | 26 +++++++-------
arch/sparc/kernel/prom_64.c | 68 ++++++++++++++++++------------------
4 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/arch/sparc/kernel/auxio_64.c b/arch/sparc/kernel/auxio_64.c
index 4e8f56c3793c..cc42225c20f3 100644
--- a/arch/sparc/kernel/auxio_64.c
+++ b/arch/sparc/kernel/auxio_64.c
@@ -115,8 +115,8 @@ static int auxio_probe(struct platform_device *dev)
auxio_devtype = AUXIO_TYPE_SBUS;
size = 1;
} else {
- printk("auxio: Unknown parent bus type [%s]\n",
- dp->parent->name);
+ printk("auxio: Unknown parent bus type [%pOFn]\n",
+ dp->parent);
return -ENODEV;
}
auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");
diff --git a/arch/sparc/kernel/power.c b/arch/sparc/kernel/power.c
index 92627abce311..d941875dd718 100644
--- a/arch/sparc/kernel/power.c
+++ b/arch/sparc/kernel/power.c
@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op)
power_reg = of_ioremap(res, 0, 0x4, "power");
- printk(KERN_INFO "%s: Control reg at %llx\n",
- op->dev.of_node->name, res->start);
+ printk(KERN_INFO "%pOFn: Control reg at %llx\n",
+ op->dev.of_node, res->start);
if (has_button_interrupt(irq, op->dev.of_node)) {
if (request_irq(irq,
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index b51cbb9e87dc..c876a8e62848 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -68,8 +68,8 @@ static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf)
return;
regs = rprop->value;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
regs->which_io, regs->phys_addr);
}
@@ -84,8 +84,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
return;
regs = prop->value;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
regs->which_io,
regs->phys_addr);
}
@@ -104,13 +104,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
devfn = (regs->phys_hi >> 8) & 0xff;
if (devfn & 0x07) {
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
devfn >> 3,
devfn & 0x07);
} else {
- sprintf(tmp_buf, "%s@%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x",
+ dp,
devfn >> 3);
}
}
@@ -127,8 +127,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
regs->which_io, regs->phys_addr);
}
@@ -167,8 +167,8 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf)
return;
device = prop->value;
- sprintf(tmp_buf, "%s:%d:%d@%x,%x",
- dp->name, *vendor, *device,
+ sprintf(tmp_buf, "%pOFn:%d:%d@%x,%x",
+ dp, *vendor, *device,
*intr, reg0);
}
@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp)
tmp_buf[0] = '\0';
__build_path_component(dp, tmp_buf);
if (tmp_buf[0] == '\0')
- strcpy(tmp_buf, dp->name);
+ snprint(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);
n = prom_early_alloc(strlen(tmp_buf) + 1);
strcpy(n, tmp_buf);
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index baeaeed64993..6220411ce8fc 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -82,8 +82,8 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
regs = rprop->value;
if (!of_node_is_root(dp->parent)) {
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
(unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL));
return;
@@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
const char *prefix = (type == 0) ? "m" : "i";
if (low_bits)
- sprintf(tmp_buf, "%s@%s%x,%x",
- dp->name, prefix,
+ sprintf(tmp_buf, "%pOFn@%s%x,%x",
+ dp, prefix,
high_bits, low_bits);
else
- sprintf(tmp_buf, "%s@%s%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%s%x",
+ dp,
prefix,
high_bits);
} else if (type == 12) {
- sprintf(tmp_buf, "%s@%x",
- dp->name, high_bits);
+ sprintf(tmp_buf, "%pOFn@%x",
+ dp, high_bits);
}
}
@@ -122,8 +122,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
if (!of_node_is_root(dp->parent)) {
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
(unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL));
return;
@@ -138,8 +138,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
if (tlb_type >= cheetah)
mask = 0x7fffff;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
*(u32 *)prop->value,
(unsigned int) (regs->phys_addr & mask));
}
@@ -156,8 +156,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
return;
regs = prop->value;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
regs->which_io,
regs->phys_addr);
}
@@ -176,13 +176,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
devfn = (regs->phys_hi >> 8) & 0xff;
if (devfn & 0x07) {
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
devfn >> 3,
devfn & 0x07);
} else {
- sprintf(tmp_buf, "%s@%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x",
+ dp,
devfn >> 3);
}
}
@@ -203,8 +203,8 @@ static void __init upa_path_component(struct device_node *dp, char *tmp_buf)
if (!prop)
return;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
*(u32 *) prop->value,
(unsigned int) (regs->phys_addr & 0xffffffffUL));
}
@@ -221,7 +221,7 @@ static void __init vdev_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
- sprintf(tmp_buf, "%s@%x", dp->name, *regs);
+ sprintf(tmp_buf, "%pOFn@%x", dp, *regs);
}
/* "name@addrhi,addrlo" */
@@ -236,8 +236,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name,
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp,
(unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL));
}
@@ -257,8 +257,8 @@ static void __init i2c_path_component(struct device_node *dp, char *tmp_buf)
/* This actually isn't right... should look at the #address-cells
* property of the i2c bus node etc. etc.
*/
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name, regs[0], regs[1]);
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp, regs[0], regs[1]);
}
/* "name@reg0[,reg1]" */
@@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value;
if (prop->length == sizeof(u32) || regs[1] == 1) {
- sprintf(tmp_buf, "%s@%x",
- dp->name, regs[0]);
+ sprintf(tmp_buf, "%pOFn@%x",
+ dp, regs[0]);
} else {
- sprintf(tmp_buf, "%s@%x,%x",
- dp->name, regs[0], regs[1]);
+ sprintf(tmp_buf, "%pOFn@%x,%x",
+ dp, regs[0], regs[1]);
}
}
@@ -295,11 +295,11 @@ static void __init ieee1394_path_component(struct device_node *dp, char *tmp_buf
regs = prop->value;
if (regs[2] || regs[3]) {
- sprintf(tmp_buf, "%s@%08x%08x,%04x%08x",
- dp->name, regs[0], regs[1], regs[2], regs[3]);
+ sprintf(tmp_buf, "%pOFn@%08x%08x,%04x%08x",
+ dp, regs[0], regs[1], regs[2], regs[3]);
} else {
- sprintf(tmp_buf, "%s@%08x%08x",
- dp->name, regs[0], regs[1]);
+ sprintf(tmp_buf, "%pOFn@%08x%08x",
+ dp, regs[0], regs[1]);
}
}
@@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp)
tmp_buf[0] = '\0';
__build_path_component(dp, tmp_buf);
if (tmp_buf[0] == '\0')
- strcpy(tmp_buf, dp->name);
+ snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);
n = prom_early_alloc(strlen(tmp_buf) + 1);
strcpy(n, tmp_buf);
--
2.17.1
next prev parent reply other threads:[~2018-08-28 1:53 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 ` Rob Herring [this message]
2018-08-28 14:13 ` [PATCH] sparc: " 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 ` [PATCH] irqchip: " Rob Herring
2018-09-08 12:15 ` 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-7-robh@kernel.org \
--to=robh@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/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).