video: fbdev: 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.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

diff --git a/drivers/video/fbdev/bw2.c b/drivers/video/fbdev/bw2.c
index 8c5b281f0b299c864664c3bba78ec3b0b3ef0599..7aa9720723577ece2bf536e2776b21e28b047c08 100644 (file)
--- a/drivers/video/fbdev/bw2.c
+++ b/drivers/video/fbdev/bw2.c
@@ -333,8 +333,8 @@ static int bw2_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
-              dp->full_name, par->which_io, info->fix.smem_start);
+       printk(KERN_INFO "%pOF: bwtwo at %lx:%lx\n",
+              dp, par->which_io, info->fix.smem_start);
 
        return 0;
 

diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c
index 43e915eaf606f31bd5c4dee0367a45fb0647bf71..8de88b129b62244c11e44092687020c2a7b0257f 100644 (file)
--- a/drivers/video/fbdev/cg14.c
+++ b/drivers/video/fbdev/cg14.c
@@ -553,8 +553,8 @@ static int cg14_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: cgfourteen at %lx:%lx, %dMB\n",
-              dp->full_name,
+       printk(KERN_INFO "%pOF: cgfourteen at %lx:%lx, %dMB\n",
+              dp,
               par->iospace, info->fix.smem_start,
               par->ramsize >> 20);
 

diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c
index 716391f22e75f97ac55751cd3b20b4d1f3e24496..6c334260cf532faca8b36f9e8e05cb76d167fcf7 100644 (file)
--- a/drivers/video/fbdev/cg3.c
+++ b/drivers/video/fbdev/cg3.c
@@ -412,8 +412,8 @@ static int cg3_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: cg3 at %lx:%lx\n",
-              dp->full_name, par->which_io, info->fix.smem_start);
+       printk(KERN_INFO "%pOF: cg3 at %lx:%lx\n",
+              dp, par->which_io, info->fix.smem_start);
 
        return 0;
 

diff --git a/drivers/video/fbdev/cg6.c b/drivers/video/fbdev/cg6.c
index bdf901ed52910e1fc8f08dde72eff1f22d312190..0296c21acc78a2bc5207694b4821c9c3f30e1750 100644 (file)
--- a/drivers/video/fbdev/cg6.c
+++ b/drivers/video/fbdev/cg6.c
@@ -810,8 +810,8 @@ static int cg6_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n",
-              dp->full_name, info->fix.id,
+       printk(KERN_INFO "%pOF: CGsix [%s] at %lx:%lx\n",
+              dp, info->fix.id,
               par->which_io, info->fix.smem_start);
 
        return 0;

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 41d7979d81c53df3d459d39939798659386444a8..2b2d673285148bc4dba1eb24c8d0d18f4d8b6a01 100644 (file)
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1479,8 +1479,8 @@ int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
        if (ret)
                return ret;
 
-       pr_debug("%s: got %dx%d display mode from %s\n",
-               of_node_full_name(np), vm.hactive, vm.vactive, np->name);
+       pr_debug("%pOF: got %dx%d display mode from %s\n",
+               np, vm.hactive, vm.vactive, np->name);
        dump_fb_videomode(fb);
 
        return 0;

diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c
index dda31e0a45af282a4b72d4ad19f33cdda1da7efc..6b1915872af1658c06f43d057f387303f6e69386 100644 (file)
--- a/drivers/video/fbdev/ffb.c
+++ b/drivers/video/fbdev/ffb.c
@@ -997,9 +997,9 @@ static int ffb_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: %s at %016lx, type %d, "
+       printk(KERN_INFO "%pOF: %s at %016lx, type %d, "
               "DAC pnum[%x] rev[%d] manuf_rev[%d]\n",
-              dp->full_name,
+              dp,
               ((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
               par->physbase, par->board_type,
               dac_pnum, dac_rev, dac_mrev);

diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c
index 62e59dc90ee64ad100980dd99eea4756d0d086b3..71862188f5285953104c62744d3216bfb8a59d10 100644 (file)
--- a/drivers/video/fbdev/leo.c
+++ b/drivers/video/fbdev/leo.c
@@ -619,8 +619,8 @@ static int leo_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: leo at %lx:%lx\n",
-              dp->full_name,
+       printk(KERN_INFO "%pOF: leo at %lx:%lx\n",
+              dp,
               par->which_io, info->fix.smem_start);
 
        return 0;

diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index 9be884b0c778b562a699d4ae620d136fa3ae4e2c..90d38de344797884fbf9d092e8095851dad21412 100644 (file)
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -383,7 +383,7 @@ static void offb_init_palette_hacks(struct fb_info *info, struct device_node *dp
                FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
 }
 
-static void __init offb_init_fb(const char *name, const char *full_name,
+static void __init offb_init_fb(const char *name,
                                int width, int height, int depth,
                                int pitch, unsigned long address,
                                int foreign_endian, struct device_node *dp)
@@ -402,14 +402,13 @@ static void __init offb_init_fb(const char *name, const char *full_name,
               "Using unsupported %dx%d %s at %lx, depth=%d, pitch=%d\n",
               width, height, name, address, depth, pitch);
        if (depth != 8 && depth != 15 && depth != 16 && depth != 32) {
-               printk(KERN_ERR "%s: can't use depth = %d\n", full_name,
-                      depth);
+               printk(KERN_ERR "%pOF: can't use depth = %d\n", dp, depth);
                release_mem_region(res_start, res_size);
                return;
        }
 
        info = framebuffer_alloc(sizeof(u32) * 16, NULL);
-       
+
        if (info == 0) {
                release_mem_region(res_start, res_size);
                return;
@@ -515,7 +514,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        if (register_framebuffer(info) < 0)
                goto out_err;
 
-       fb_info(info, "Open Firmware frame buffer device on %s\n", full_name);
+       fb_info(info, "Open Firmware frame buffer device on %pOF\n", dp);
        return;
 
 out_err:
@@ -644,7 +643,6 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
                if (strcmp(dp->name, "valkyrie") == 0)
                        address += 0x1000;
                offb_init_fb(no_real_node ? "bootx" : dp->name,
-                            no_real_node ? "display" : dp->full_name,
                             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 1f6ee76af8786d59ecbe6d90c9036c908476d0d1..64de5cda541ddd5e55c24a2f60079d962b5add8d 100644 (file)
--- a/drivers/video/fbdev/p9100.c
+++ b/drivers/video/fbdev/p9100.c
@@ -304,8 +304,8 @@ static int p9100_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: p9100 at %lx:%lx\n",
-              dp->full_name,
+       printk(KERN_INFO "%pOF: p9100 at %lx:%lx\n",
+              dp,
               par->which_io, info->fix.smem_start);
 
        return 0;

diff --git a/drivers/video/fbdev/sunxvr1000.c b/drivers/video/fbdev/sunxvr1000.c
index fb37f6e053915a62c82564d6b929df8a9d044426..8fe37c0ef2f504448bd162fc2feab2b3a857a432 100644 (file)
--- a/drivers/video/fbdev/sunxvr1000.c
+++ b/drivers/video/fbdev/sunxvr1000.c
@@ -33,8 +33,8 @@ static int gfb_get_props(struct gfb_info *gp)
        gp->depth = of_getintprop_default(gp->of_node, "depth", 32);
 
        if (!gp->width || !gp->height) {
-               printk(KERN_ERR "gfb: Critical properties missing for %s\n",
-                      gp->of_node->full_name);
+               printk(KERN_ERR "gfb: Critical properties missing for %pOF\n",
+                      gp->of_node);
                return -EINVAL;
        }
 
@@ -151,12 +151,12 @@ static int gfb_probe(struct platform_device *op)
        if (err)
                goto err_unmap_fb;
 
-       printk("gfb: Found device at %s\n", dp->full_name);
+       printk("gfb: Found device at %pOF\n", dp);
 
        err = register_framebuffer(info);
        if (err < 0) {
-               printk(KERN_ERR "gfb: Could not register framebuffer %s\n",
-                      dp->full_name);
+               printk(KERN_ERR "gfb: Could not register framebuffer %pOF\n",
+                      dp);
                goto err_unmap_fb;
        }
 

diff --git a/drivers/video/fbdev/tcx.c b/drivers/video/fbdev/tcx.c
index 54ad08854c94a36155aa28364fdfb0022db645b8..c98d8a569ccd2429306bb2376d6239077dea4ed6 100644 (file)
--- a/drivers/video/fbdev/tcx.c
+++ b/drivers/video/fbdev/tcx.c
@@ -467,8 +467,8 @@ static int tcx_probe(struct platform_device *op)
 
        dev_set_drvdata(&op->dev, info);
 
-       printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n",
-              dp->full_name,
+       printk(KERN_INFO "%pOF: TCX at %lx:%lx, %s\n",
+              dp,
               par->which_io,
               info->fix.smem_start,
               par->lowdepth ? "8-bit only" : "24-bit depth");

diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 32b0a75434333b4d8678d95be1fca0e8289e4eb3..8ce0a99bf17ccf0fcb549639ff530dbfd5e0471c 100644 (file)
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -31,8 +31,7 @@ static int parse_timing_property(const struct device_node *np, const char *name,
 
        prop = of_find_property(np, name, &length);
        if (!prop) {
-               pr_err("%s: could not find property %s\n",
-                       of_node_full_name(np), name);
+               pr_err("%pOF: could not find property %s\n", np, name);
                return -EINVAL;
        }
 
@@ -44,8 +43,7 @@ static int parse_timing_property(const struct device_node *np, const char *name,
        } else if (cells == 3) {
                ret = of_property_read_u32_array(np, name, &result->min, cells);
        } else {
-               pr_err("%s: illegal timing specification in %s\n",
-                       of_node_full_name(np), name);
+               pr_err("%pOF: illegal timing specification in %s\n", np, name);
                return -EINVAL;
        }
 
@@ -105,8 +103,7 @@ static int of_parse_display_timing(const struct device_node *np,
                dt->flags |= DISPLAY_FLAGS_DOUBLECLK;
 
        if (ret) {
-               pr_err("%s: error reading timing properties\n",
-                       of_node_full_name(np));
+               pr_err("%pOF: error reading timing properties\n", np);
                return -EINVAL;
        }
 
@@ -129,8 +126,7 @@ int of_get_display_timing(const struct device_node *np, const char *name,
 
        timing_np = of_get_child_by_name(np, name);
        if (!timing_np) {
-               pr_err("%s: could not find node '%s'\n",
-                       of_node_full_name(np), name);
+               pr_err("%pOF: could not find node '%s'\n", np, name);
                return -ENOENT;
        }
 
@@ -154,15 +150,13 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
 
        timings_np = of_get_child_by_name(np, "display-timings");
        if (!timings_np) {
-               pr_err("%s: could not find display-timings node\n",
-                       of_node_full_name(np));
+               pr_err("%pOF: could not find display-timings node\n", np);
                return NULL;
        }
 
        disp = kzalloc(sizeof(*disp), GFP_KERNEL);
        if (!disp) {
-               pr_err("%s: could not allocate struct disp'\n",
-                       of_node_full_name(np));
+               pr_err("%pOF: could not allocate struct disp'\n", np);
                goto dispfail;
        }
 
@@ -172,28 +166,25 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
                entry = of_get_next_child(timings_np, NULL);
        /* if there is no child, it is useless to go on */
        if (!entry) {
-               pr_err("%s: no timing specifications given\n",
-                       of_node_full_name(np));
+               pr_err("%pOF: no timing specifications given\n", np);
                goto entryfail;
        }
 
-       pr_debug("%s: using %s as default timing\n",
-               of_node_full_name(np), entry->name);
+       pr_debug("%pOF: using %s as default timing\n", np, entry->name);
 
        native_mode = entry;
 
        disp->num_timings = of_get_child_count(timings_np);
        if (disp->num_timings == 0) {
                /* should never happen, as entry was already found above */
-               pr_err("%s: no timings specified\n", of_node_full_name(np));
+               pr_err("%pOF: no timings specified\n", np);
                goto entryfail;
        }
 
        disp->timings = kzalloc(sizeof(struct display_timing *) *
                                disp->num_timings, GFP_KERNEL);
        if (!disp->timings) {
-               pr_err("%s: could not allocate timings array\n",
-                       of_node_full_name(np));
+               pr_err("%pOF: could not allocate timings array\n", np);
                goto entryfail;
        }
 
@@ -206,8 +197,8 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
 
                dt = kzalloc(sizeof(*dt), GFP_KERNEL);
                if (!dt) {
-                       pr_err("%s: could not allocate display_timing struct\n",
-                                       of_node_full_name(np));
+                       pr_err("%pOF: could not allocate display_timing struct\n",
+                               np);
                        goto timingfail;
                }
 
@@ -217,8 +208,8 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
                         * to not encourage wrong devicetrees, fail in case of
                         * an error
                         */
-                       pr_err("%s: error in timing %d\n",
-                               of_node_full_name(np), disp->num_timings + 1);
+                       pr_err("%pOF: error in timing %d\n",
+                               np, disp->num_timings + 1);
                        kfree(dt);
                        goto timingfail;
                }
@@ -236,8 +227,8 @@ struct display_timings *of_get_display_timings(const struct device_node *np)
         */
        of_node_put(native_mode);
 
-       pr_debug("%s: got %d timings. Using timing #%d as default\n",
-               of_node_full_name(np), disp->num_timings,
+       pr_debug("%pOF: got %d timings. Using timing #%d as default\n",
+               np, disp->num_timings,
                disp->native_mode + 1);
 
        return disp;

diff --git a/drivers/video/of_videomode.c b/drivers/video/of_videomode.c
index b5102aa6090d111e25727f78422c8cbc183f086a..9b5f9de88fec8e5f707337285e41dc9edfb7c4c1 100644 (file)
--- a/drivers/video/of_videomode.c
+++ b/drivers/video/of_videomode.c
@@ -36,7 +36,7 @@ int of_get_videomode(struct device_node *np, struct videomode *vm,
 
        disp = of_get_display_timings(np);
        if (!disp) {
-               pr_err("%s: no timings specified\n", of_node_full_name(np));
+               pr_err("%pOF: no timings specified\n", np);
                return -EINVAL;
        }