Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Daniel Vetter
4bf99144 af055598

+72 -80
+1 -2
drivers/gpu/drm/armada/armada_crtc.c
··· 1329 1329 port = of_get_child_by_name(parent, "port"); 1330 1330 of_node_put(np); 1331 1331 if (!port) { 1332 - dev_err(dev, "no port node found in %s\n", 1333 - parent->full_name); 1332 + dev_err(dev, "no port node found in %pOF\n", parent); 1334 1333 return -ENXIO; 1335 1334 } 1336 1335
+2 -2
drivers/gpu/drm/armada/armada_drv.c
··· 232 232 of_node_put(remote); 233 233 continue; 234 234 } else if (!of_device_is_available(remote->parent)) { 235 - dev_warn(dev, "parent device of %s is not available\n", 236 - remote->full_name); 235 + dev_warn(dev, "parent device of %pOF is not available\n", 236 + remote); 237 237 of_node_put(remote); 238 238 continue; 239 239 }
+3 -3
drivers/gpu/drm/drm_mipi_dsi.c
··· 165 165 u32 reg; 166 166 167 167 if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { 168 - dev_err(dev, "modalias failure on %s\n", node->full_name); 168 + dev_err(dev, "modalias failure on %pOF\n", node); 169 169 return ERR_PTR(-EINVAL); 170 170 } 171 171 172 172 ret = of_property_read_u32(node, "reg", &reg); 173 173 if (ret) { 174 - dev_err(dev, "device node %s has no valid reg property: %d\n", 175 - node->full_name, ret); 174 + dev_err(dev, "device node %pOF has no valid reg property: %d\n", 175 + node, ret); 176 176 return ERR_PTR(-EINVAL); 177 177 } 178 178
+2 -2
drivers/gpu/drm/drm_modes.c
··· 709 709 if (bus_flags) 710 710 drm_bus_flags_from_videomode(&vm, bus_flags); 711 711 712 - pr_debug("%s: got %dx%d display mode from %s\n", 713 - of_node_full_name(np), vm.hactive, vm.vactive, np->name); 712 + pr_debug("%pOF: got %dx%d display mode from %s\n", 713 + np, vm.hactive, vm.vactive, np->name); 714 714 drm_mode_debug_printmodeline(dmode); 715 715 716 716 return 0;
+2 -2
drivers/gpu/drm/drm_of.c
··· 160 160 of_node_put(remote); 161 161 continue; 162 162 } else if (!of_device_is_available(remote->parent)) { 163 - dev_warn(dev, "parent device of %s is not available\n", 164 - remote->full_name); 163 + dev_warn(dev, "parent device of %pOF is not available\n", 164 + remote); 165 165 of_node_put(remote); 166 166 continue; 167 167 }
+1 -2
drivers/gpu/drm/exynos/exynos_drm_dsi.c
··· 1618 1618 int ret = of_property_read_u32(np, propname, out_value); 1619 1619 1620 1620 if (ret < 0) 1621 - pr_err("%s: failed to get '%s' property\n", np->full_name, 1622 - propname); 1621 + pr_err("%pOF: failed to get '%s' property\n", np, propname); 1623 1622 1624 1623 return ret; 1625 1624 }
+1 -2
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
··· 585 585 */ 586 586 port = of_get_child_by_name(dev->dev->of_node, "port"); 587 587 if (!port) { 588 - DRM_ERROR("no port node found in %s\n", 589 - dev->dev->of_node->full_name); 588 + DRM_ERROR("no port node found in %pOF\n", dev->dev->of_node); 590 589 return -EINVAL; 591 590 } 592 591 of_node_put(port);
+2 -2
drivers/gpu/drm/mediatek/mtk_disp_color.c
··· 84 84 85 85 ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp); 86 86 if (ret < 0) { 87 - dev_err(dev, "Failed to register component %s: %d\n", 88 - dev->of_node->full_name, ret); 87 + dev_err(dev, "Failed to register component %pOF: %d\n", 88 + dev->of_node, ret); 89 89 return ret; 90 90 } 91 91
+2 -2
drivers/gpu/drm/mediatek/mtk_disp_ovl.c
··· 235 235 236 236 ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp); 237 237 if (ret < 0) { 238 - dev_err(dev, "Failed to register component %s: %d\n", 239 - dev->of_node->full_name, ret); 238 + dev_err(dev, "Failed to register component %pOF: %d\n", 239 + dev->of_node, ret); 240 240 return ret; 241 241 } 242 242
+2 -2
drivers/gpu/drm/mediatek/mtk_disp_rdma.c
··· 155 155 156 156 ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp); 157 157 if (ret < 0) { 158 - dev_err(dev, "Failed to register component %s: %d\n", 159 - dev->of_node->full_name, ret); 158 + dev_err(dev, "Failed to register component %pOF: %d\n", 159 + dev->of_node, ret); 160 160 return ret; 161 161 } 162 162
+3 -3
drivers/gpu/drm/mediatek/mtk_dpi.c
··· 605 605 606 606 ret = mtk_ddp_comp_register(drm_dev, &dpi->ddp_comp); 607 607 if (ret < 0) { 608 - dev_err(dev, "Failed to register component %s: %d\n", 609 - dev->of_node->full_name, ret); 608 + dev_err(dev, "Failed to register component %pOF: %d\n", 609 + dev->of_node, ret); 610 610 return ret; 611 611 } 612 612 ··· 710 710 if (!bridge_node) 711 711 return -ENODEV; 712 712 713 - dev_info(dev, "Found bridge node: %s\n", bridge_node->full_name); 713 + dev_info(dev, "Found bridge node: %pOF\n", bridge_node); 714 714 715 715 dpi->bridge = of_drm_find_bridge(bridge_node); 716 716 of_node_put(bridge_node);
+3 -4
drivers/gpu/drm/mediatek/mtk_drm_crtc.c
··· 579 579 node = priv->comp_node[comp_id]; 580 580 comp = priv->ddp_comp[comp_id]; 581 581 if (!comp) { 582 - dev_err(dev, "Component %s not initialized\n", 583 - node->full_name); 582 + dev_err(dev, "Component %pOF not initialized\n", node); 584 583 ret = -ENODEV; 585 584 goto unprepare; 586 585 } ··· 587 588 ret = clk_prepare(comp->clk); 588 589 if (ret) { 589 590 dev_err(dev, 590 - "Failed to prepare clock for component %s: %d\n", 591 - node->full_name, ret); 591 + "Failed to prepare clock for component %pOF: %d\n", 592 + node, ret); 592 593 goto unprepare; 593 594 } 594 595
+2 -4
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
··· 295 295 larb_node = of_parse_phandle(node, "mediatek,larb", 0); 296 296 if (!larb_node) { 297 297 dev_err(dev, 298 - "Missing mediadek,larb phandle in %s node\n", 299 - node->full_name); 298 + "Missing mediadek,larb phandle in %pOF node\n", node); 300 299 return -EINVAL; 301 300 } 302 301 303 302 larb_pdev = of_find_device_by_node(larb_node); 304 303 if (!larb_pdev) { 305 - dev_warn(dev, "Waiting for larb device %s\n", 306 - larb_node->full_name); 304 + dev_warn(dev, "Waiting for larb device %pOF\n", larb_node); 307 305 of_node_put(larb_node); 308 306 return -EPROBE_DEFER; 309 307 }
+8 -8
drivers/gpu/drm/mediatek/mtk_drm_drv.c
··· 192 192 193 193 pdev = of_find_device_by_node(private->mutex_node); 194 194 if (!pdev) { 195 - dev_err(drm->dev, "Waiting for disp-mutex device %s\n", 196 - private->mutex_node->full_name); 195 + dev_err(drm->dev, "Waiting for disp-mutex device %pOF\n", 196 + private->mutex_node); 197 197 of_node_put(private->mutex_node); 198 198 return -EPROBE_DEFER; 199 199 } ··· 421 421 continue; 422 422 423 423 if (!of_device_is_available(node)) { 424 - dev_dbg(dev, "Skipping disabled component %s\n", 425 - node->full_name); 424 + dev_dbg(dev, "Skipping disabled component %pOF\n", 425 + node); 426 426 continue; 427 427 } 428 428 ··· 435 435 436 436 comp_id = mtk_ddp_comp_get_id(node, comp_type); 437 437 if (comp_id < 0) { 438 - dev_warn(dev, "Skipping unknown component %s\n", 439 - node->full_name); 438 + dev_warn(dev, "Skipping unknown component %pOF\n", 439 + node); 440 440 continue; 441 441 } 442 442 ··· 452 452 comp_type == MTK_DISP_RDMA || 453 453 comp_type == MTK_DSI || 454 454 comp_type == MTK_DPI) { 455 - dev_info(dev, "Adding component match for %s\n", 456 - node->full_name); 455 + dev_info(dev, "Adding component match for %pOF\n", 456 + node); 457 457 drm_of_component_match_add(dev, &match, compare_of, 458 458 node); 459 459 } else {
+2 -2
drivers/gpu/drm/mediatek/mtk_dsi.c
··· 1048 1048 1049 1049 ret = mtk_ddp_comp_register(drm, &dsi->ddp_comp); 1050 1050 if (ret < 0) { 1051 - dev_err(dev, "Failed to register component %s: %d\n", 1052 - dev->of_node->full_name, ret); 1051 + dev_err(dev, "Failed to register component %pOF: %d\n", 1052 + dev->of_node, ret); 1053 1053 return ret; 1054 1054 } 1055 1055
+4 -4
drivers/gpu/drm/mediatek/mtk_hdmi.c
··· 1456 1456 1457 1457 cec_pdev = of_find_device_by_node(cec_np); 1458 1458 if (!cec_pdev) { 1459 - dev_err(hdmi->dev, "Waiting for CEC device %s\n", 1460 - cec_np->full_name); 1459 + dev_err(hdmi->dev, "Waiting for CEC device %pOF\n", 1460 + cec_np); 1461 1461 return -EPROBE_DEFER; 1462 1462 } 1463 1463 hdmi->cec_dev = &cec_pdev->dev; ··· 1501 1501 1502 1502 i2c_np = of_parse_phandle(remote, "ddc-i2c-bus", 0); 1503 1503 if (!i2c_np) { 1504 - dev_err(dev, "Failed to find ddc-i2c-bus node in %s\n", 1505 - remote->full_name); 1504 + dev_err(dev, "Failed to find ddc-i2c-bus node in %pOF\n", 1505 + remote); 1506 1506 of_node_put(remote); 1507 1507 return -EINVAL; 1508 1508 }
+2 -3
drivers/gpu/drm/meson/meson_drv.c
··· 303 303 304 304 static int compare_of(struct device *dev, void *data) 305 305 { 306 - DRM_DEBUG_DRIVER("Comparing of node %s with %s\n", 307 - of_node_full_name(dev->of_node), 308 - of_node_full_name(data)); 306 + DRM_DEBUG_DRIVER("Comparing of node %pOF with %pOF\n", 307 + dev->of_node, data); 309 308 310 309 return dev->of_node == data; 311 310 }
+8 -8
drivers/gpu/drm/panel/panel-lvds.c
··· 143 143 144 144 ret = of_property_read_u32(np, "width-mm", &lvds->width); 145 145 if (ret < 0) { 146 - dev_err(lvds->dev, "%s: invalid or missing %s DT property\n", 147 - of_node_full_name(np), "width-mm"); 146 + dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n", 147 + np, "width-mm"); 148 148 return -ENODEV; 149 149 } 150 150 ret = of_property_read_u32(np, "height-mm", &lvds->height); 151 151 if (ret < 0) { 152 - dev_err(lvds->dev, "%s: invalid or missing %s DT property\n", 153 - of_node_full_name(np), "height-mm"); 152 + dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n", 153 + np, "height-mm"); 154 154 return -ENODEV; 155 155 } 156 156 ··· 158 158 159 159 ret = of_property_read_string(np, "data-mapping", &mapping); 160 160 if (ret < 0) { 161 - dev_err(lvds->dev, "%s: invalid or missing %s DT property\n", 162 - of_node_full_name(np), "data-mapping"); 161 + dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n", 162 + np, "data-mapping"); 163 163 return -ENODEV; 164 164 } 165 165 ··· 170 170 } else if (!strcmp(mapping, "vesa-24")) { 171 171 lvds->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG; 172 172 } else { 173 - dev_err(lvds->dev, "%s: invalid or missing %s DT property\n", 174 - of_node_full_name(np), "data-mapping"); 173 + dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n", 174 + np, "data-mapping"); 175 175 return -EINVAL; 176 176 } 177 177
+2 -2
drivers/gpu/drm/rcar-du/rcar_du_encoder.c
··· 186 186 } 187 187 188 188 if (enc_node) { 189 - dev_dbg(rcdu->dev, "initializing encoder %s for output %u\n", 190 - of_node_full_name(enc_node), output); 189 + dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n", 190 + enc_node, output); 191 191 192 192 /* Locate the DRM bridge from the encoder DT node. */ 193 193 bridge = of_drm_find_bridge(enc_node);
+8 -8
drivers/gpu/drm/rcar-du/rcar_du_kms.c
··· 297 297 */ 298 298 entity = of_graph_get_remote_port_parent(ep->local_node); 299 299 if (!entity) { 300 - dev_dbg(rcdu->dev, "unconnected endpoint %s, skipping\n", 301 - ep->local_node->full_name); 300 + dev_dbg(rcdu->dev, "unconnected endpoint %pOF, skipping\n", 301 + ep->local_node); 302 302 return -ENODEV; 303 303 } 304 304 305 305 if (!of_device_is_available(entity)) { 306 306 dev_dbg(rcdu->dev, 307 - "connected entity %s is disabled, skipping\n", 308 - entity->full_name); 307 + "connected entity %pOF is disabled, skipping\n", 308 + entity); 309 309 return -ENODEV; 310 310 } 311 311 ··· 325 325 326 326 if (!connector) { 327 327 dev_warn(rcdu->dev, 328 - "no connector for encoder %s, skipping\n", 329 - encoder->full_name); 328 + "no connector for encoder %pOF, skipping\n", 329 + encoder); 330 330 of_node_put(entity_ep_node); 331 331 of_node_put(encoder); 332 332 return -ENODEV; ··· 348 348 ret = rcar_du_encoder_init(rcdu, output, encoder, connector); 349 349 if (ret && ret != -EPROBE_DEFER) 350 350 dev_warn(rcdu->dev, 351 - "failed to initialize encoder %s on output %u (%d), skipping\n", 352 - of_node_full_name(encoder), output, ret); 351 + "failed to initialize encoder %pOF on output %u (%d), skipping\n", 352 + encoder, output, ret); 353 353 354 354 of_node_put(encoder); 355 355 of_node_put(connector);
+2 -2
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
··· 368 368 369 369 iommu = of_parse_phandle(port->parent, "iommus", 0); 370 370 if (!iommu || !of_device_is_available(iommu->parent)) { 371 - dev_dbg(dev, "no iommu attached for %s, using non-iommu buffers\n", 372 - port->parent->full_name); 371 + dev_dbg(dev, "no iommu attached for %pOF, using non-iommu buffers\n", 372 + port->parent); 373 373 /* 374 374 * if there is a crtc not support iommu, force set all 375 375 * crtc use non-iommu buffer.
+2 -2
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 1343 1343 1344 1344 port = of_get_child_by_name(dev->of_node, "port"); 1345 1345 if (!port) { 1346 - DRM_DEV_ERROR(vop->dev, "no port node found in %s\n", 1347 - dev->of_node->full_name); 1346 + DRM_DEV_ERROR(vop->dev, "no port node found in %pOF\n", 1347 + dev->of_node); 1348 1348 ret = -ENOENT; 1349 1349 goto err_cleanup_crtc; 1350 1350 }
+4 -5
drivers/gpu/drm/sun4i/sun4i_drv.c
··· 187 187 188 188 static int compare_of(struct device *dev, void *data) 189 189 { 190 - DRM_DEBUG_DRIVER("Comparing of node %s with %s\n", 191 - of_node_full_name(dev->of_node), 192 - of_node_full_name(data)); 190 + DRM_DEBUG_DRIVER("Comparing of node %pOF with %pOF\n", 191 + dev->of_node, 192 + data); 193 193 194 194 return dev->of_node == data; 195 195 } ··· 219 219 220 220 if (!sun4i_drv_node_is_frontend(node)) { 221 221 /* Add current component */ 222 - DRM_DEBUG_DRIVER("Adding component %s\n", 223 - of_node_full_name(node)); 222 + DRM_DEBUG_DRIVER("Adding component %pOF\n", node); 224 223 drm_of_component_match_add(dev, match, compare_of, node); 225 224 count++; 226 225 }
+2 -2
drivers/gpu/drm/tilcdc/tilcdc_crtc.c
··· 1050 1050 if (priv->is_componentized) { 1051 1051 crtc->port = of_graph_get_port_by_id(dev->dev->of_node, 0); 1052 1052 if (!crtc->port) { /* This should never happen */ 1053 - dev_err(dev->dev, "Port node not found in %s\n", 1054 - dev->dev->of_node->full_name); 1053 + dev_err(dev->dev, "Port node not found in %pOF\n", 1054 + dev->dev->of_node); 1055 1055 ret = -EINVAL; 1056 1056 goto fail; 1057 1057 }
+2 -2
drivers/gpu/ipu-v3/ipu-common.c
··· 1217 1217 of_node = of_graph_get_port_by_id(dev->of_node, i); 1218 1218 if (!of_node) { 1219 1219 dev_info(dev, 1220 - "no port@%d node in %s, not using %s%d\n", 1221 - i, dev->of_node->full_name, 1220 + "no port@%d node in %pOF, not using %s%d\n", 1221 + i, dev->of_node, 1222 1222 (i / 2) ? "DI" : "CSI", i % 2); 1223 1223 continue; 1224 1224 }