drm: 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>
Cc: Russell King <linux@armlinux.org.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Partially-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
[seanpaul changed subject prefix and fixed conflict in stm/ltdc.c]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index b57fb80..1ffba91 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1329,8 +1329,7 @@ armada_lcd_bind(struct device *dev, struct device *master, void *data)
                port = of_get_child_by_name(parent, "port");
                of_node_put(np);
                if (!port) {
-                       dev_err(dev, "no port node found in %s\n",
-                               parent->full_name);
+                       dev_err(dev, "no port node found in %pOF\n", parent);
                        return -ENXIO;
                }
 

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index e618fab..0b3227c 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -232,8 +232,8 @@ static void armada_add_endpoints(struct device *dev,
                        of_node_put(remote);
                        continue;
                } else if (!of_device_is_available(remote->parent)) {
-                       dev_warn(dev, "parent device of %s is not available\n",
-                                remote->full_name);
+                       dev_warn(dev, "parent device of %pOF is not available\n",
+                                remote);
                        of_node_put(remote);
                        continue;
                }

diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index 1160a57..4b47226 100644 (file)
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -165,14 +165,14 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
        u32 reg;
 
        if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {
-               dev_err(dev, "modalias failure on %s\n", node->full_name);
+               dev_err(dev, "modalias failure on %pOF\n", node);
                return ERR_PTR(-EINVAL);
        }
 
        ret = of_property_read_u32(node, "reg", &reg);
        if (ret) {
-               dev_err(dev, "device node %s has no valid reg property: %d\n",
-                       node->full_name, ret);
+               dev_err(dev, "device node %pOF has no valid reg property: %d\n",
+                       node, ret);
                return ERR_PTR(-EINVAL);
        }
 

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index c1aec53..d52f0a1 100644 (file)
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -709,8 +709,8 @@ int of_get_drm_display_mode(struct device_node *np,
        if (bus_flags)
                drm_bus_flags_from_videomode(&vm, bus_flags);
 
-       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);
        drm_mode_debug_printmodeline(dmode);
 
        return 0;

diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 2120f33..8dafbdf 100644 (file)
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -160,8 +160,8 @@ int drm_of_component_probe(struct device *dev,
                                of_node_put(remote);
                                continue;
                        } else if (!of_device_is_available(remote->parent)) {
-                               dev_warn(dev, "parent device of %s is not available\n",
-                                        remote->full_name);
+                               dev_warn(dev, "parent device of %pOF is not available\n",
+                                        remote);
                                of_node_put(remote);
                                continue;
                        }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index a11b795..f580be1 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1618,8 +1618,7 @@ static int exynos_dsi_of_read_u32(const struct device_node *np,
        int ret = of_property_read_u32(np, propname, out_value);
 
        if (ret < 0)
-               pr_err("%s: failed to get '%s' property\n", np->full_name,
-                      propname);
+               pr_err("%pOF: failed to get '%s' property\n", np, propname);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index 7e3abbf..706efd0 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -585,8 +585,7 @@ static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
         */
        port = of_get_child_by_name(dev->dev->of_node, "port");
        if (!port) {
-               DRM_ERROR("no port node found in %s\n",
-                         dev->dev->of_node->full_name);
+               DRM_ERROR("no port node found in %pOF\n", dev->dev->of_node);
                return -EINVAL;
        }
        of_node_put(port);

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c b/drivers/gpu/drm/mediatek/mtk_disp_color.c
index ef79a6d..f609b62 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
@@ -84,8 +84,8 @@ static int mtk_disp_color_bind(struct device *dev, struct device *master,
 
        ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp);
        if (ret < 0) {
-               dev_err(dev, "Failed to register component %s: %d\n",
-                       dev->of_node->full_name, ret);
+               dev_err(dev, "Failed to register component %pOF: %d\n",
+                       dev->of_node, ret);
                return ret;
        }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 35bc5ba..978782a 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -235,8 +235,8 @@ static int mtk_disp_ovl_bind(struct device *dev, struct device *master,
 
        ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp);
        if (ret < 0) {
-               dev_err(dev, "Failed to register component %s: %d\n",
-                       dev->of_node->full_name, ret);
+               dev_err(dev, "Failed to register component %pOF: %d\n",
+                       dev->of_node, ret);
                return ret;
        }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index b68a513..585943c 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -155,8 +155,8 @@ static int mtk_disp_rdma_bind(struct device *dev, struct device *master,
 
        ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp);
        if (ret < 0) {
-               dev_err(dev, "Failed to register component %s: %d\n",
-                       dev->of_node->full_name, ret);
+               dev_err(dev, "Failed to register component %pOF: %d\n",
+                       dev->of_node, ret);
                return ret;
        }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 32ca351..e80a603 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -605,8 +605,8 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
 
        ret = mtk_ddp_comp_register(drm_dev, &dpi->ddp_comp);
        if (ret < 0) {
-               dev_err(dev, "Failed to register component %s: %d\n",
-                       dev->of_node->full_name, ret);
+               dev_err(dev, "Failed to register component %pOF: %d\n",
+                       dev->of_node, ret);
                return ret;
        }
 
@@ -710,7 +710,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)
        if (!bridge_node)
                return -ENODEV;
 
-       dev_info(dev, "Found bridge node: %s\n", bridge_node->full_name);
+       dev_info(dev, "Found bridge node: %pOF\n", bridge_node);
 
        dpi->bridge = of_drm_find_bridge(bridge_node);
        of_node_put(bridge_node);

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 1f0ef17..658b8dd 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -579,8 +579,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                node = priv->comp_node[comp_id];
                comp = priv->ddp_comp[comp_id];
                if (!comp) {
-                       dev_err(dev, "Component %s not initialized\n",
-                               node->full_name);
+                       dev_err(dev, "Component %pOF not initialized\n", node);
                        ret = -ENODEV;
                        goto unprepare;
                }
@@ -588,8 +587,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                ret = clk_prepare(comp->clk);
                if (ret) {
                        dev_err(dev,
-                               "Failed to prepare clock for component %s: %d\n",
-                               node->full_name, ret);
+                               "Failed to prepare clock for component %pOF: %d\n",
+                               node, ret);
                        goto unprepare;
                }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 07d7ea2..4672317 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -295,15 +295,13 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
        larb_node = of_parse_phandle(node, "mediatek,larb", 0);
        if (!larb_node) {
                dev_err(dev,
-                       "Missing mediadek,larb phandle in %s node\n",
-                       node->full_name);
+                       "Missing mediadek,larb phandle in %pOF node\n", node);
                return -EINVAL;
        }
 
        larb_pdev = of_find_device_by_node(larb_node);
        if (!larb_pdev) {
-               dev_warn(dev, "Waiting for larb device %s\n",
-                        larb_node->full_name);
+               dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
                of_node_put(larb_node);
                return -EPROBE_DEFER;
        }

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index c816352..f0cb276 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -192,8 +192,8 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 
        pdev = of_find_device_by_node(private->mutex_node);
        if (!pdev) {
-               dev_err(drm->dev, "Waiting for disp-mutex device %s\n",
-                       private->mutex_node->full_name);
+               dev_err(drm->dev, "Waiting for disp-mutex device %pOF\n",
+                       private->mutex_node);
                of_node_put(private->mutex_node);
                return -EPROBE_DEFER;
        }
@@ -421,8 +421,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
                        continue;
 
                if (!of_device_is_available(node)) {
-                       dev_dbg(dev, "Skipping disabled component %s\n",
-                               node->full_name);
+                       dev_dbg(dev, "Skipping disabled component %pOF\n",
+                               node);
                        continue;
                }
 
@@ -435,8 +435,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
 
                comp_id = mtk_ddp_comp_get_id(node, comp_type);
                if (comp_id < 0) {
-                       dev_warn(dev, "Skipping unknown component %s\n",
-                                node->full_name);
+                       dev_warn(dev, "Skipping unknown component %pOF\n",
+                                node);
                        continue;
                }
 
@@ -452,8 +452,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
                    comp_type == MTK_DISP_RDMA ||
                    comp_type == MTK_DSI ||
                    comp_type == MTK_DPI) {
-                       dev_info(dev, "Adding component match for %s\n",
-                                node->full_name);
+                       dev_info(dev, "Adding component match for %pOF\n",
+                                node);
                        drm_of_component_match_add(dev, &match, compare_of,
                                                   node);
                } else {

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 97253c8..a31bd2a 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -1048,8 +1048,8 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
 
        ret = mtk_ddp_comp_register(drm, &dsi->ddp_comp);
        if (ret < 0) {
-               dev_err(dev, "Failed to register component %s: %d\n",
-                       dev->of_node->full_name, ret);
+               dev_err(dev, "Failed to register component %pOF: %d\n",
+                       dev->of_node, ret);
                return ret;
        }
 

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 252d373..f2437cd 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1456,8 +1456,8 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
 
        cec_pdev = of_find_device_by_node(cec_np);
        if (!cec_pdev) {
-               dev_err(hdmi->dev, "Waiting for CEC device %s\n",
-                       cec_np->full_name);
+               dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
+                       cec_np);
                return -EPROBE_DEFER;
        }
        hdmi->cec_dev = &cec_pdev->dev;
@@ -1501,8 +1501,8 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
 
        i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0);
        if (!i2c_np) {
-               dev_err(dev, "Failed to find ddc-i2c-bus node in %s\n",
-                       remote->full_name);
+               dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n",
+                       remote);
                of_node_put(remote);
                return -EINVAL;
        }

diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 4d98fac..5375e6d 100644 (file)
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -303,9 +303,8 @@ static const struct component_master_ops meson_drv_master_ops = {
 
 static int compare_of(struct device *dev, void *data)
 {
-       DRM_DEBUG_DRIVER("Comparing of node %s with %s\n",
-                        of_node_full_name(dev->of_node),
-                        of_node_full_name(data));
+       DRM_DEBUG_DRIVER("Comparing of node %pOF with %pOF\n",
+                        dev->of_node, data);
 
        return dev->of_node == data;
 }

diff --git a/drivers/gpu/drm/panel/panel-lvds.c b/drivers/gpu/drm/panel/panel-lvds.c
index 3216aa9..e2d57c0 100644 (file)
--- a/drivers/gpu/drm/panel/panel-lvds.c
+++ b/drivers/gpu/drm/panel/panel-lvds.c
@@ -143,14 +143,14 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)
 
        ret = of_property_read_u32(np, "width-mm", &lvds->width);
        if (ret < 0) {
-               dev_err(lvds->dev, "%s: invalid or missing %s DT property\n",
-                       of_node_full_name(np), "width-mm");
+               dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",
+                       np, "width-mm");
                return -ENODEV;
        }
        ret = of_property_read_u32(np, "height-mm", &lvds->height);
        if (ret < 0) {
-               dev_err(lvds->dev, "%s: invalid or missing %s DT property\n",
-                       of_node_full_name(np), "height-mm");
+               dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",
+                       np, "height-mm");
                return -ENODEV;
        }
 
@@ -158,8 +158,8 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)
 
        ret = of_property_read_string(np, "data-mapping", &mapping);
        if (ret < 0) {
-               dev_err(lvds->dev, "%s: invalid or missing %s DT property\n",
-                       of_node_full_name(np), "data-mapping");
+               dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",
+                       np, "data-mapping");
                return -ENODEV;
        }
 
@@ -170,8 +170,8 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)
        } else if (!strcmp(mapping, "vesa-24")) {
                lvds->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG;
        } else {
-               dev_err(lvds->dev, "%s: invalid or missing %s DT property\n",
-                       of_node_full_name(np), "data-mapping");
+               dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",
+                       np, "data-mapping");
                return -EINVAL;
        }
 

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index 3e048dd..ba8d280 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -186,8 +186,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
        }
 
        if (enc_node) {
-               dev_dbg(rcdu->dev, "initializing encoder %s for output %u\n",
-                       of_node_full_name(enc_node), output);
+               dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n",
+                       enc_node, output);
 
                /* Locate the DRM bridge from the encoder DT node. */
                bridge = of_drm_find_bridge(enc_node);

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index f4125c8..5d681ea 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -297,15 +297,15 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
         */
        entity = of_graph_get_remote_port_parent(ep->local_node);
        if (!entity) {
-               dev_dbg(rcdu->dev, "unconnected endpoint %s, skipping\n",
-                       ep->local_node->full_name);
+               dev_dbg(rcdu->dev, "unconnected endpoint %pOF, skipping\n",
+                       ep->local_node);
                return -ENODEV;
        }
 
        if (!of_device_is_available(entity)) {
                dev_dbg(rcdu->dev,
-                       "connected entity %s is disabled, skipping\n",
-                       entity->full_name);
+                       "connected entity %pOF is disabled, skipping\n",
+                       entity);
                return -ENODEV;
        }
 
@@ -325,8 +325,8 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
 
                if (!connector) {
                        dev_warn(rcdu->dev,
-                                "no connector for encoder %s, skipping\n",
-                                encoder->full_name);
+                                "no connector for encoder %pOF, skipping\n",
+                                encoder);
                        of_node_put(entity_ep_node);
                        of_node_put(encoder);
                        return -ENODEV;
@@ -348,8 +348,8 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
        ret = rcar_du_encoder_init(rcdu, output, encoder, connector);
        if (ret && ret != -EPROBE_DEFER)
                dev_warn(rcdu->dev,
-                        "failed to initialize encoder %s on output %u (%d), skipping\n",
-                        of_node_full_name(encoder), output, ret);
+                        "failed to initialize encoder %pOF on output %u (%d), skipping\n",
+                        encoder, output, ret);
 
        of_node_put(encoder);
        of_node_put(connector);

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index b9fbf4b..131cb5c 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -368,8 +368,8 @@ static int rockchip_drm_platform_of_probe(struct device *dev)
 
                iommu = of_parse_phandle(port->parent, "iommus", 0);
                if (!iommu || !of_device_is_available(iommu->parent)) {
-                       dev_dbg(dev, "no iommu attached for %s, using non-iommu buffers\n",
-                               port->parent->full_name);
+                       dev_dbg(dev, "no iommu attached for %pOF, using non-iommu buffers\n",
+                               port->parent);
                        /*
                         * if there is a crtc not support iommu, force set all
                         * crtc use non-iommu buffer.

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index f90088b..9434d61 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1343,8 +1343,8 @@ static int vop_create_crtc(struct vop *vop)
 
        port = of_get_child_by_name(dev->of_node, "port");
        if (!port) {
-               DRM_DEV_ERROR(vop->dev, "no port node found in %s\n",
-                             dev->of_node->full_name);
+               DRM_DEV_ERROR(vop->dev, "no port node found in %pOF\n",
+                             dev->of_node);
                ret = -ENOENT;
                goto err_cleanup_crtc;
        }

diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index abc7d8f..89cd590 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -187,9 +187,9 @@ static bool sun4i_drv_node_is_tcon(struct device_node *node)
 
 static int compare_of(struct device *dev, void *data)
 {
-       DRM_DEBUG_DRIVER("Comparing of node %s with %s\n",
-                        of_node_full_name(dev->of_node),
-                        of_node_full_name(data));
+       DRM_DEBUG_DRIVER("Comparing of node %pOF with %pOF\n",
+                        dev->of_node,
+                        data);
 
        return dev->of_node == data;
 }
@@ -219,8 +219,7 @@ static int sun4i_drv_add_endpoints(struct device *dev,
 
        if (!sun4i_drv_node_is_frontend(node)) {
                /* Add current component */
-               DRM_DEBUG_DRIVER("Adding component %s\n",
-                                of_node_full_name(node));
+               DRM_DEBUG_DRIVER("Adding component %pOF\n", node);
                drm_of_component_match_add(dev, match, compare_of, node);
                count++;
        }

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index a43e720..406fe45 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -1050,8 +1050,8 @@ int tilcdc_crtc_create(struct drm_device *dev)
        if (priv->is_componentized) {
                crtc->port = of_graph_get_port_by_id(dev->dev->of_node, 0);
                if (!crtc->port) { /* This should never happen */
-                       dev_err(dev->dev, "Port node not found in %s\n",
-                               dev->dev->of_node->full_name);
+                       dev_err(dev->dev, "Port node not found in %pOF\n",
+                               dev->dev->of_node);
                        ret = -EINVAL;
                        goto fail;
                }

diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 960d816..6a573d2 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -1217,8 +1217,8 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
                of_node = of_graph_get_port_by_id(dev->of_node, i);
                if (!of_node) {
                        dev_info(dev,
-                                "no port@%d node in %s, not using %s%d\n",
-                                i, dev->of_node->full_name,
+                                "no port@%d node in %pOF, not using %s%d\n",
+                                i, dev->of_node,
                                 (i / 2) ? "DI" : "CSI", i % 2);
                        continue;
                }