From: Rob Herring <robh@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org
Subject: [PATCH] fbdev: Convert to using %pOFn instead of device_node.name
Date: Mon, 27 Aug 2018 20:52:50 -0500 [thread overview]
Message-ID: <20180828015252.28511-49-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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/video/fbdev/cg14.c | 4 +---
drivers/video/fbdev/cg3.c | 2 +-
drivers/video/fbdev/core/fbmon.c | 4 ++--
drivers/video/fbdev/imsttfb.c | 2 +-
drivers/video/fbdev/leo.c | 2 +-
drivers/video/fbdev/offb.c | 12 ++++++++----
drivers/video/fbdev/p9100.c | 2 +-
drivers/video/of_display_timing.c | 2 +-
8 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c
index 8de88b129b62..9af54c2368fd 100644
--- a/drivers/video/fbdev/cg14.c
+++ b/drivers/video/fbdev/cg14.c
@@ -355,9 +355,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
static void cg14_init_fix(struct fb_info *info, int linebytes,
struct device_node *dp)
{
- const char *name = dp->name;
-
- strlcpy(info->fix.id, name, sizeof(info->fix.id));
+ snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp);
info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c
index 6c334260cf53..1bd95b02f3aa 100644
--- a/drivers/video/fbdev/cg3.c
+++ b/drivers/video/fbdev/cg3.c
@@ -246,7 +246,7 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
static void cg3_init_fix(struct fb_info *info, int linebytes,
struct device_node *dp)
{
- strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
+ snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp);
info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 852d86c1c527..dd3128990776 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1480,8 +1480,8 @@ int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
if (ret)
return ret;
- pr_debug("%pOF: got %dx%d display mode from %s\n",
- np, vm.hactive, vm.vactive, np->name);
+ pr_debug("%pOF: got %dx%d display mode\n",
+ np, vm.hactive, vm.vactive);
dump_fb_videomode(fb);
return 0;
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index ecdcf358ad5e..901ca4ed10e9 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1473,7 +1473,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dp = pci_device_to_OF_node(pdev);
if(dp)
- printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
+ printk(KERN_INFO "%s: OF name %pOFn\n",__func__, dp);
else if (IS_ENABLED(CONFIG_OF))
printk(KERN_ERR "imsttfb: no OF node for pci device\n");
diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c
index 71862188f528..446ac3364bad 100644
--- a/drivers/video/fbdev/leo.c
+++ b/drivers/video/fbdev/leo.c
@@ -434,7 +434,7 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
static void
leo_init_fix(struct fb_info *info, struct device_node *dp)
{
- strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
+ snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp);
info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_TRUECOLOR;
diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index 77c0a2f45b3b..31f769d67195 100644
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -419,9 +419,13 @@ static void __init offb_init_fb(const char *name,
var = &info->var;
info->par = par;
- strcpy(fix->id, "OFfb ");
- strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb "));
- fix->id[sizeof(fix->id) - 1] = '\0';
+ if (name) {
+ strcpy(fix->id, "OFfb ");
+ strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb "));
+ fix->id[sizeof(fix->id) - 1] = '\0';
+ } else
+ snprintf(fix->id, sizeof(fix->id), "OFfb %pOFn", dp);
+
var->xres = var->xres_virtual = width;
var->yres = var->yres_virtual = height;
@@ -644,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
/* kludge for valkyrie */
if (strcmp(dp->name, "valkyrie") == 0)
address += 0x1000;
- offb_init_fb(no_real_node ? "bootx" : dp->name,
+ offb_init_fb(no_real_node ? "bootx" : NULL,
width, height, depth, pitch, address,
foreign_endian, no_real_node ? NULL : dp);
}
diff --git a/drivers/video/fbdev/p9100.c b/drivers/video/fbdev/p9100.c
index 64de5cda541d..c4283e9e95af 100644
--- a/drivers/video/fbdev/p9100.c
+++ b/drivers/video/fbdev/p9100.c
@@ -239,7 +239,7 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd,
static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)
{
- strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
+ snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp);
info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 5244e93ceafc..c2e7aa103fa5 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -170,7 +170,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
goto entryfail;
}
- pr_debug("%pOF: using %s as default timing\n", np, entry->name);
+ pr_debug("%pOF: using %pOFn as default timing\n", np, entry);
native_mode = entry;
--
2.17.1
next prev parent reply other threads:[~2018-08-28 1:55 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 ` [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 ` Rob Herring [this message]
2018-09-28 22:11 ` [PATCH] fbdev: " 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-49-robh@kernel.org \
--to=robh@kernel.org \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@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).