From mboxrd@z Thu Jan 1 00:00:00 1970 From: robh@kernel.org (Rob Herring) Date: Tue, 18 Jul 2017 16:43:04 -0500 Subject: [PATCH] gpu: Convert to using %pOF instead of full_name Message-ID: <20170718214339.7774-24-robh@kernel.org> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org 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 Cc: Russell King Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: Javier Martinez Canillas Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: Neil Armstrong Cc: Carlo Caione Cc: Kevin Hilman Cc: Thierry Reding Cc: Laurent Pinchart Cc: Mark Yao Cc: Heiko Stuebner Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Jyri Sarha Cc: Tomi Valkeinen Cc: dri-devel at lists.freedesktop.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-samsung-soc at vger.kernel.org Cc: linux-mediatek at lists.infradead.org Cc: linux-amlogic at lists.infradead.org Cc: linux-renesas-soc at vger.kernel.org Cc: linux-rockchip at lists.infradead.org --- drivers/gpu/drm/armada/armada_crtc.c | 3 +-- drivers/gpu/drm/armada/armada_drv.c | 4 ++-- drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- drivers/gpu/drm/drm_modes.c | 4 ++-- drivers/gpu/drm/drm_of.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 +-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 +++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 6 ++---- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++-------- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 ++++---- drivers/gpu/drm/meson/meson_drv.c | 5 ++--- drivers/gpu/drm/panel/panel-lvds.c | 16 ++++++++-------- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++-- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 16 ++++++++-------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- drivers/gpu/drm/stm/ltdc.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 9 ++++----- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 ++-- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 26 files changed, 73 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 4fe19fde84f9..85977c08879e 100644 --- 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 e618fab7f519..0b3227c039d7 100644 --- 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 1160a579e0dc..4b47226b90d4 100644 --- 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", ®); 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 f2493b9b82e6..a7f2a81c76f7 100644 --- 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 2120f33bdf4a..8dafbdfcd2ea 100644 --- 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 a11b79596e2f..f580be170089 100644 --- 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 c96c228a9898..a9e6db024131 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -583,8 +583,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 ef79a6d55646..f609b62b8be6 100644 --- 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 35bc5babdbf7..978782a77629 100644 --- 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 b68a51376f83..585943c81e1f 100644 --- 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 32ca351ecd09..e80a603e5fb0 100644 --- 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 cb32c9369f3a..9fa2e3d217c1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -577,8 +577,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; } @@ -586,8 +585,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 07d7ea2268ef..4672317e3ad1 100644 --- 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 41d2cffe953e..b67923589dc2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -187,8 +187,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; } @@ -417,8 +417,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; } @@ -431,8 +431,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; } @@ -448,8 +448,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 97253c8f813b..a31bd2a82de5 100644 --- 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 71eb4fbbfc85..fef246c2577c 100644 --- 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 4d98fac92795..5375e6dccdd7 100644 --- 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 3216aa9a88d6..e2d57c01200b 100644 --- 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 3e048dd98b64..ba8d2804c1d1 100644 --- 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 f4125c8ca902..5d681ea53be6 100644 --- 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 c6b1b7f3a2a3..02410429edf7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -370,8 +370,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 5d450332c2fd..aa3407f13bbd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1340,8 +1340,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/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 1b9483d4f2a4..cd4e74743d77 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -995,8 +995,7 @@ static struct drm_panel *ltdc_get_panel(struct drm_device *ddev) panel = of_drm_find_panel(port); of_node_put(port); if (panel) { - DRM_DEBUG_DRIVER("remote panel %s\n", - port->full_name); + DRM_DEBUG_DRIVER("remote panel %pOF\n", port); } else { DRM_DEBUG_DRIVER("panel missing\n"); of_node_put(entity); diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index abc7d8fe06b4..89cd590723ac 100644 --- 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 d524ed0d5146..8416c1fa0dd8 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -1038,8 +1038,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 960d816ad7f7..6a573d21d3cc 100644 --- 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; } -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH] gpu: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:04 -0500 Message-ID: <20170718214339.7774-24-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Sean Paul Cc: Neil Armstrong , dri-devel@lists.freedesktop.org, Thierry Reding , Laurent Pinchart , linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, Kevin Hilman , Russell King , Krzysztof Kozlowski , Xinliang Liu , Javier Martinez Canillas , Xinwei Kong , Kukjin Kim , devicetree@vger.kernel.org, Chen Feng , Tomi Valkeinen , Carlo Caione , linux-mediatek@lists.infradead.org, Jyri Sarha , Matthias Brugger , linux-amlogic@lists.infradead.org, Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, Seung- List-Id: linux-mediatek@lists.infradead.org Tm93IHRoYXQgd2UgaGF2ZSBhIGN1c3RvbSBwcmludGYgZm9ybWF0IHNwZWNpZmllciwgY29udmVy dCB1c2VycyBvZgpmdWxsX25hbWUgdG8gdXNlICVwT0YgaW5zdGVhZC4gVGhpcyBpcyBwcmVwYXJh dGlvbiB0byByZW1vdmUgc3RvcmluZwpvZiB0aGUgZnVsbCBwYXRoIHN0cmluZyBmb3IgZWFjaCBu b2RlLgoKU2lnbmVkLW9mZi1ieTogUm9iIEhlcnJpbmcgPHJvYmhAa2VybmVsLm9yZz4KQ2M6IFJ1 c3NlbGwgS2luZyA8bGludXhAYXJtbGludXgub3JnLnVrPgpDYzogRGF2aWQgQWlybGllIDxhaXJs aWVkQGxpbnV4LmllPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+ CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogU2VhbiBQ YXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CkNjOiBJbmtpIERhZSA8aW5raS5kYWVAc2Ftc3Vu Zy5jb20+CkNjOiBKb29ueW91bmcgU2hpbSA8ankwOTIyLnNoaW1Ac2Ftc3VuZy5jb20+CkNjOiBT ZXVuZy1Xb28gS2ltIDxzdzAzMTIua2ltQHNhbXN1bmcuY29tPgpDYzogS3l1bmdtaW4gUGFyayA8 a3l1bmdtaW4ucGFya0BzYW1zdW5nLmNvbT4KQ2M6IEt1a2ppbiBLaW0gPGtnZW5lQGtlcm5lbC5v cmc+CkNjOiBLcnp5c3p0b2YgS296bG93c2tpIDxrcnprQGtlcm5lbC5vcmc+CkNjOiBKYXZpZXIg TWFydGluZXogQ2FuaWxsYXMgPGphdmllckBvc2cuc2Ftc3VuZy5jb20+CkNjOiBYaW5saWFuZyBM aXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KQ2M6IFJvbmdyb25nIFpvdSA8em91cm9u Z3JvbmdAZ21haWwuY29tPgpDYzogWGlud2VpIEtvbmcgPGtvbmcua29uZ3hpbndlaUBoaXNpbGlj b24uY29tPgpDYzogQ2hlbiBGZW5nIDxwdWNrLmNoZW5AaGlzaWxpY29uLmNvbT4KQ2M6IENLIEh1 IDxjay5odUBtZWRpYXRlay5jb20+CkNjOiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJv bml4LmRlPgpDYzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4KQ2M6 IE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT4KQ2M6IENhcmxvIENhaW9u ZSA8Y2FybG9AY2Fpb25lLm9yZz4KQ2M6IEtldmluIEhpbG1hbiA8a2hpbG1hbkBiYXlsaWJyZS5j b20+CkNjOiBUaGllcnJ5IFJlZGluZyA8dGhpZXJyeS5yZWRpbmdAZ21haWwuY29tPgpDYzogTGF1 cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29tPgpDYzogTWFy ayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29tPgpDYzogSGVpa28gU3R1ZWJuZXIgPGhlaWtv QHNudGVjaC5kZT4KQ2M6IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRAZnJlZS1lbGVjdHJv bnMuY29tPgpDYzogQ2hlbi1ZdSBUc2FpIDx3ZW5zQGNzaWUub3JnPgpDYzogSnlyaSBTYXJoYSA8 anNhcmhhQHRpLmNvbT4KQ2M6IFRvbWkgVmFsa2VpbmVuIDx0b21pLnZhbGtlaW5lbkB0aS5jb20+ CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBsaW51eC1hcm0ta2VybmVs QGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IGxpbnV4LXNhbXN1bmctc29jQHZnZXIua2VybmVsLm9y ZwpDYzogbGludXgtbWVkaWF0ZWtAbGlzdHMuaW5mcmFkZWFkLm9yZwpDYzogbGludXgtYW1sb2dp Y0BsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1yZW5lc2FzLXNvY0B2Z2VyLmtlcm5lbC5v cmcKQ2M6IGxpbnV4LXJvY2tjaGlwQGxpc3RzLmluZnJhZGVhZC5vcmcKLS0tCiBkcml2ZXJzL2dw dS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMgICAgICAgICAgICB8ICAzICstLQogZHJpdmVycy9n cHUvZHJtL2FybWFkYS9hcm1hZGFfZHJ2LmMgICAgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJz L2dwdS9kcm0vZHJtX21pcGlfZHNpLmMgICAgICAgICAgICAgICAgICB8ICA2ICsrKy0tLQogZHJp dmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jICAgICAgICAgICAgICAgICAgICAgfCAgNCArKy0tCiBk cml2ZXJzL2dwdS9kcm0vZHJtX29mLmMgICAgICAgICAgICAgICAgICAgICAgICB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9kc2kuYyAgICAgICAgIHwgIDMgKy0t CiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyB8ICAzICst LQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX2NvbG9yLmMgICAgICAgfCAgNCAr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3Bfb3ZsLmMgICAgICAgICB8ICA0 ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZGlzcF9yZG1hLmMgICAgICAgIHwg IDQgKystLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcGkuYyAgICAgICAgICAgICAg fCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2NydGMuYyAgICAg ICAgIHwgIDcgKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2Nv bXAuYyAgICAgfCAgNiArKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Ry di5jICAgICAgICAgIHwgMTYgKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lZGlh dGVrL210a19kc2kuYyAgICAgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vbWVk aWF0ZWsvbXRrX2hkbWkuYyAgICAgICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9k cm0vbWVzb24vbWVzb25fZHJ2LmMgICAgICAgICAgICAgICB8ICA1ICsrLS0tCiBkcml2ZXJzL2dw dS9kcm0vcGFuZWwvcGFuZWwtbHZkcy5jICAgICAgICAgICAgICB8IDE2ICsrKysrKysrLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZW5jb2Rlci5jICAgICAgIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYyAgICAgICAgICAgfCAx NiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X2Rydi5jICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9k cm1fdm9wLmMgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMgICAgICAg ICAgICAgICAgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9kcnYu YyAgICAgICAgICAgICAgIHwgIDkgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdGlsY2RjL3Rp bGNkY19jcnRjLmMgICAgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2lwdS12My9pcHUt Y29tbW9uLmMgICAgICAgICAgICAgICAgIHwgIDQgKystLQogMjYgZmlsZXMgY2hhbmdlZCwgNzMg aW5zZXJ0aW9ucygrKSwgODIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FybWFkYS9hcm1hZGFfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFf Y3J0Yy5jCmluZGV4IDRmZTE5ZmRlODRmOS4uODU5NzdjMDg4NzllIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Fy bWFkYS9hcm1hZGFfY3J0Yy5jCkBAIC0xMzI5LDggKzEzMjksNyBAQCBhcm1hZGFfbGNkX2JpbmQo c3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCiAJ CXBvcnQgPSBvZl9nZXRfY2hpbGRfYnlfbmFtZShwYXJlbnQsICJwb3J0Iik7CiAJCW9mX25vZGVf cHV0KG5wKTsKIAkJaWYgKCFwb3J0KSB7Ci0JCQlkZXZfZXJyKGRldiwgIm5vIHBvcnQgbm9kZSBm b3VuZCBpbiAlc1xuIiwKLQkJCQlwYXJlbnQtPmZ1bGxfbmFtZSk7CisJCQlkZXZfZXJyKGRldiwg Im5vIHBvcnQgbm9kZSBmb3VuZCBpbiAlcE9GXG4iLCBwYXJlbnQpOwogCQkJcmV0dXJuIC1FTlhJ TzsKIAkJfQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfZHJ2LmMKaW5kZXggZTYxOGZhYjdmNTE5 Li4wYjMyMjdjMDM5ZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRh X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2Rydi5jCkBAIC0yMzIs OCArMjMyLDggQEAgc3RhdGljIHZvaWQgYXJtYWRhX2FkZF9lbmRwb2ludHMoc3RydWN0IGRldmlj ZSAqZGV2LAogCQkJb2Zfbm9kZV9wdXQocmVtb3RlKTsKIAkJCWNvbnRpbnVlOwogCQl9IGVsc2Ug aWYgKCFvZl9kZXZpY2VfaXNfYXZhaWxhYmxlKHJlbW90ZS0+cGFyZW50KSkgewotCQkJZGV2X3dh cm4oZGV2LCAicGFyZW50IGRldmljZSBvZiAlcyBpcyBub3QgYXZhaWxhYmxlXG4iLAotCQkJCSBy ZW1vdGUtPmZ1bGxfbmFtZSk7CisJCQlkZXZfd2FybihkZXYsICJwYXJlbnQgZGV2aWNlIG9mICVw T0YgaXMgbm90IGF2YWlsYWJsZVxuIiwKKwkJCQkgcmVtb3RlKTsKIAkJCW9mX25vZGVfcHV0KHJl bW90ZSk7CiAJCQljb250aW51ZTsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9taXBpX2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9taXBpX2RzaS5jCmluZGV4IDExNjBh NTc5ZTBkYy4uNGI0NzIyNmI5MGQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21p cGlfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9taXBpX2RzaS5jCkBAIC0xNjUsMTQg KzE2NSwxNCBAQCBvZl9taXBpX2RzaV9kZXZpY2VfYWRkKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpo b3N0LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCiAJdTMyIHJlZzsKCiAJaWYgKG9mX21vZGFs aWFzX25vZGUobm9kZSwgaW5mby50eXBlLCBzaXplb2YoaW5mby50eXBlKSkgPCAwKSB7Ci0JCWRl dl9lcnIoZGV2LCAibW9kYWxpYXMgZmFpbHVyZSBvbiAlc1xuIiwgbm9kZS0+ZnVsbF9uYW1lKTsK KwkJZGV2X2VycihkZXYsICJtb2RhbGlhcyBmYWlsdXJlIG9uICVwT0ZcbiIsIG5vZGUpOwogCQly ZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKIAl9CgogCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRfdTMy KG5vZGUsICJyZWciLCAmcmVnKTsKIAlpZiAocmV0KSB7Ci0JCWRldl9lcnIoZGV2LCAiZGV2aWNl IG5vZGUgJXMgaGFzIG5vIHZhbGlkIHJlZyBwcm9wZXJ0eTogJWRcbiIsCi0JCQlub2RlLT5mdWxs X25hbWUsIHJldCk7CisJCWRldl9lcnIoZGV2LCAiZGV2aWNlIG5vZGUgJXBPRiBoYXMgbm8gdmFs aWQgcmVnIHByb3BlcnR5OiAlZFxuIiwKKwkJCW5vZGUsIHJldCk7CiAJCXJldHVybiBFUlJfUFRS KC1FSU5WQUwpOwogCX0KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKaW5kZXggZjI0OTNiOWI4MmU2Li5hN2YyYTgx Yzc2ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKQEAgLTcwOSw4ICs3MDksOCBAQCBpbnQgb2ZfZ2V0X2Ry bV9kaXNwbGF5X21vZGUoc3RydWN0IGRldmljZV9ub2RlICpucCwKIAlpZiAoYnVzX2ZsYWdzKQog CQlkcm1fYnVzX2ZsYWdzX2Zyb21fdmlkZW9tb2RlKCZ2bSwgYnVzX2ZsYWdzKTsKCi0JcHJfZGVi dWcoIiVzOiBnb3QgJWR4JWQgZGlzcGxheSBtb2RlIGZyb20gJXNcbiIsCi0JCW9mX25vZGVfZnVs bF9uYW1lKG5wKSwgdm0uaGFjdGl2ZSwgdm0udmFjdGl2ZSwgbnAtPm5hbWUpOworCXByX2RlYnVn KCIlcE9GOiBnb3QgJWR4JWQgZGlzcGxheSBtb2RlIGZyb20gJXNcbiIsCisJCW5wLCB2bS5oYWN0 aXZlLCB2bS52YWN0aXZlLCBucC0+bmFtZSk7CiAJZHJtX21vZGVfZGVidWdfcHJpbnRtb2RlbGlu ZShkbW9kZSk7CgogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9v Zi5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9vZi5jCmluZGV4IDIxMjBmMzNiZGY0YS4uOGRhZmJk ZmNkMmVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX29mLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9vZi5jCkBAIC0xNjAsOCArMTYwLDggQEAgaW50IGRybV9vZl9jb21wb25l bnRfcHJvYmUoc3RydWN0IGRldmljZSAqZGV2LAogCQkJCW9mX25vZGVfcHV0KHJlbW90ZSk7CiAJ CQkJY29udGludWU7CiAJCQl9IGVsc2UgaWYgKCFvZl9kZXZpY2VfaXNfYXZhaWxhYmxlKHJlbW90 ZS0+cGFyZW50KSkgewotCQkJCWRldl93YXJuKGRldiwgInBhcmVudCBkZXZpY2Ugb2YgJXMgaXMg bm90IGF2YWlsYWJsZVxuIiwKLQkJCQkJIHJlbW90ZS0+ZnVsbF9uYW1lKTsKKwkJCQlkZXZfd2Fy bihkZXYsICJwYXJlbnQgZGV2aWNlIG9mICVwT0YgaXMgbm90IGF2YWlsYWJsZVxuIiwKKwkJCQkJ IHJlbW90ZSk7CiAJCQkJb2Zfbm9kZV9wdXQocmVtb3RlKTsKIAkJCQljb250aW51ZTsKIAkJCX0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9kc2kuYyBiL2Ry aXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9kc2kuYwppbmRleCBhMTFiNzk1OTZlMmYu LmY1ODBiZTE3MDA4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3Nf ZHJtX2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9kc2kuYwpA QCAtMTYxOCw4ICsxNjE4LDcgQEAgc3RhdGljIGludCBleHlub3NfZHNpX29mX3JlYWRfdTMyKGNv bnN0IHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAsCiAJaW50IHJldCA9IG9mX3Byb3BlcnR5X3JlYWRf dTMyKG5wLCBwcm9wbmFtZSwgb3V0X3ZhbHVlKTsKCiAJaWYgKHJldCA8IDApCi0JCXByX2Vycigi JXM6IGZhaWxlZCB0byBnZXQgJyVzJyBwcm9wZXJ0eVxuIiwgbnAtPmZ1bGxfbmFtZSwKLQkJICAg ICAgIHByb3BuYW1lKTsKKwkJcHJfZXJyKCIlcE9GOiBmYWlsZWQgdG8gZ2V0ICclcycgcHJvcGVy dHlcbiIsIG5wLCBwcm9wbmFtZSk7CgogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCmluZGV4IGM5NmMyMjhhOTg5OC4u YTllNmRiMDI0MTMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmlu L2tpcmluX2RybV9hZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tp cmluX2RybV9hZGUuYwpAQCAtNTgzLDggKzU4Myw3IEBAIHN0YXRpYyBpbnQgYWRlX2NydGNfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICovCiAJ cG9ydCA9IG9mX2dldF9jaGlsZF9ieV9uYW1lKGRldi0+ZGV2LT5vZl9ub2RlLCAicG9ydCIpOwog CWlmICghcG9ydCkgewotCQlEUk1fRVJST1IoIm5vIHBvcnQgbm9kZSBmb3VuZCBpbiAlc1xuIiwK LQkJCSAgZGV2LT5kZXYtPm9mX25vZGUtPmZ1bGxfbmFtZSk7CisJCURSTV9FUlJPUigibm8gcG9y dCBub2RlIGZvdW5kIGluICVwT0ZcbiIsIGRldi0+ZGV2LT5vZl9ub2RlKTsKIAkJcmV0dXJuIC1F SU5WQUw7CiAJfQogCW9mX25vZGVfcHV0KHBvcnQpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL21lZGlhdGVrL210a19kaXNwX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsv bXRrX2Rpc3BfY29sb3IuYwppbmRleCBlZjc5YTZkNTU2NDYuLmY2MDliNjJiOGJlNiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX2NvbG9yLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX2NvbG9yLmMKQEAgLTg0LDggKzg0LDggQEAg c3RhdGljIGludCBtdGtfZGlzcF9jb2xvcl9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0 IGRldmljZSAqbWFzdGVyLAoKIAlyZXQgPSBtdGtfZGRwX2NvbXBfcmVnaXN0ZXIoZHJtX2Rldiwg JnByaXYtPmRkcF9jb21wKTsKIAlpZiAocmV0IDwgMCkgewotCQlkZXZfZXJyKGRldiwgIkZhaWxl ZCB0byByZWdpc3RlciBjb21wb25lbnQgJXM6ICVkXG4iLAotCQkJZGV2LT5vZl9ub2RlLT5mdWxs X25hbWUsIHJldCk7CisJCWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIHJlZ2lzdGVyIGNvbXBvbmVu dCAlcE9GOiAlZFxuIiwKKwkJCWRldi0+b2Zfbm9kZSwgcmV0KTsKIAkJcmV0dXJuIHJldDsKIAl9 CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292bC5jIGIv ZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292bC5jCmluZGV4IDM1YmM1YmFiZGJm Ny4uOTc4NzgyYTc3NjI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2Rpc3Bfb3ZsLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292bC5j CkBAIC0yMzUsOCArMjM1LDggQEAgc3RhdGljIGludCBtdGtfZGlzcF9vdmxfYmluZChzdHJ1Y3Qg ZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKCiAJcmV0ID0gbXRrX2RkcF9jb21w X3JlZ2lzdGVyKGRybV9kZXYsICZwcml2LT5kZHBfY29tcCk7CiAJaWYgKHJldCA8IDApIHsKLQkJ ZGV2X2VycihkZXYsICJGYWlsZWQgdG8gcmVnaXN0ZXIgY29tcG9uZW50ICVzOiAlZFxuIiwKLQkJ CWRldi0+b2Zfbm9kZS0+ZnVsbF9uYW1lLCByZXQpOworCQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0 byByZWdpc3RlciBjb21wb25lbnQgJXBPRjogJWRcbiIsCisJCQlkZXYtPm9mX25vZGUsIHJldCk7 CiAJCXJldHVybiByZXQ7CiAJfQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZGlzcF9yZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3BfcmRt YS5jCmluZGV4IGI2OGE1MTM3NmY4My4uNTg1OTQzYzgxZTFmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3BfcmRtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9t ZWRpYXRlay9tdGtfZGlzcF9yZG1hLmMKQEAgLTE1NSw4ICsxNTUsOCBAQCBzdGF0aWMgaW50IG10 a19kaXNwX3JkbWFfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3Rl ciwKCiAJcmV0ID0gbXRrX2RkcF9jb21wX3JlZ2lzdGVyKGRybV9kZXYsICZwcml2LT5kZHBfY29t cCk7CiAJaWYgKHJldCA8IDApIHsKLQkJZGV2X2VycihkZXYsICJGYWlsZWQgdG8gcmVnaXN0ZXIg Y29tcG9uZW50ICVzOiAlZFxuIiwKLQkJCWRldi0+b2Zfbm9kZS0+ZnVsbF9uYW1lLCByZXQpOwor CQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byByZWdpc3RlciBjb21wb25lbnQgJXBPRjogJWRcbiIs CisJCQlkZXYtPm9mX25vZGUsIHJldCk7CiAJCXJldHVybiByZXQ7CiAJfQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHBpLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVk aWF0ZWsvbXRrX2RwaS5jCmluZGV4IDMyY2EzNTFlY2QwOS4uZTgwYTYwM2U1ZmIwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RwaS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9tZWRpYXRlay9tdGtfZHBpLmMKQEAgLTYwNSw4ICs2MDUsOCBAQCBzdGF0aWMgaW50IG10 a19kcGlfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9p ZCAqZGF0YSkKCiAJcmV0ID0gbXRrX2RkcF9jb21wX3JlZ2lzdGVyKGRybV9kZXYsICZkcGktPmRk cF9jb21wKTsKIAlpZiAocmV0IDwgMCkgewotCQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byByZWdp c3RlciBjb21wb25lbnQgJXM6ICVkXG4iLAotCQkJZGV2LT5vZl9ub2RlLT5mdWxsX25hbWUsIHJl dCk7CisJCWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIHJlZ2lzdGVyIGNvbXBvbmVudCAlcE9GOiAl ZFxuIiwKKwkJCWRldi0+b2Zfbm9kZSwgcmV0KTsKIAkJcmV0dXJuIHJldDsKIAl9CgpAQCAtNzEw LDcgKzcxMCw3IEBAIHN0YXRpYyBpbnQgbXRrX2RwaV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2KQogCWlmICghYnJpZGdlX25vZGUpCiAJCXJldHVybiAtRU5PREVWOwoKLQlkZXZf aW5mbyhkZXYsICJGb3VuZCBicmlkZ2Ugbm9kZTogJXNcbiIsIGJyaWRnZV9ub2RlLT5mdWxsX25h bWUpOworCWRldl9pbmZvKGRldiwgIkZvdW5kIGJyaWRnZSBub2RlOiAlcE9GXG4iLCBicmlkZ2Vf bm9kZSk7CgogCWRwaS0+YnJpZGdlID0gb2ZfZHJtX2ZpbmRfYnJpZGdlKGJyaWRnZV9ub2RlKTsK IAlvZl9ub2RlX3B1dChicmlkZ2Vfbm9kZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bWVkaWF0ZWsvbXRrX2RybV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9jcnRjLmMKaW5kZXggY2IzMmM5MzY5ZjNhLi45ZmEyZTNkMjE3YzEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vbWVkaWF0ZWsvbXRrX2RybV9jcnRjLmMKQEAgLTU3Nyw4ICs1NzcsNyBAQCBpbnQgbXRrX2Ry bV9jcnRjX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiwKIAkJbm9kZSA9IHByaXYt PmNvbXBfbm9kZVtjb21wX2lkXTsKIAkJY29tcCA9IHByaXYtPmRkcF9jb21wW2NvbXBfaWRdOwog CQlpZiAoIWNvbXApIHsKLQkJCWRldl9lcnIoZGV2LCAiQ29tcG9uZW50ICVzIG5vdCBpbml0aWFs aXplZFxuIiwKLQkJCQlub2RlLT5mdWxsX25hbWUpOworCQkJZGV2X2VycihkZXYsICJDb21wb25l bnQgJXBPRiBub3QgaW5pdGlhbGl6ZWRcbiIsIG5vZGUpOwogCQkJcmV0ID0gLUVOT0RFVjsKIAkJ CWdvdG8gdW5wcmVwYXJlOwogCQl9CkBAIC01ODYsOCArNTg1LDggQEAgaW50IG10a19kcm1fY3J0 Y19jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYsCiAJCXJldCA9IGNsa19wcmVwYXJl KGNvbXAtPmNsayk7CiAJCWlmIChyZXQpIHsKIAkJCWRldl9lcnIoZGV2LAotCQkJCSJGYWlsZWQg dG8gcHJlcGFyZSBjbG9jayBmb3IgY29tcG9uZW50ICVzOiAlZFxuIiwKLQkJCQlub2RlLT5mdWxs X25hbWUsIHJldCk7CisJCQkJIkZhaWxlZCB0byBwcmVwYXJlIGNsb2NrIGZvciBjb21wb25lbnQg JXBPRjogJWRcbiIsCisJCQkJbm9kZSwgcmV0KTsKIAkJCWdvdG8gdW5wcmVwYXJlOwogCQl9Cgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2NvbXAuYyBi L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2RkcF9jb21wLmMKaW5kZXggMDdkN2Vh MjI2OGVmLi40NjcyMzE3ZTNhZDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZHJtX2RkcF9jb21wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19k cm1fZGRwX2NvbXAuYwpAQCAtMjk1LDE1ICsyOTUsMTMgQEAgaW50IG10a19kZHBfY29tcF9pbml0 KHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9ub2RlICpub2RlLAogCWxhcmJfbm9k ZSA9IG9mX3BhcnNlX3BoYW5kbGUobm9kZSwgIm1lZGlhdGVrLGxhcmIiLCAwKTsKIAlpZiAoIWxh cmJfbm9kZSkgewogCQlkZXZfZXJyKGRldiwKLQkJCSJNaXNzaW5nIG1lZGlhZGVrLGxhcmIgcGhh bmRsZSBpbiAlcyBub2RlXG4iLAotCQkJbm9kZS0+ZnVsbF9uYW1lKTsKKwkJCSJNaXNzaW5nIG1l ZGlhZGVrLGxhcmIgcGhhbmRsZSBpbiAlcE9GIG5vZGVcbiIsIG5vZGUpOwogCQlyZXR1cm4gLUVJ TlZBTDsKIAl9CgogCWxhcmJfcGRldiA9IG9mX2ZpbmRfZGV2aWNlX2J5X25vZGUobGFyYl9ub2Rl KTsKIAlpZiAoIWxhcmJfcGRldikgewotCQlkZXZfd2FybihkZXYsICJXYWl0aW5nIGZvciBsYXJi IGRldmljZSAlc1xuIiwKLQkJCSBsYXJiX25vZGUtPmZ1bGxfbmFtZSk7CisJCWRldl93YXJuKGRl diwgIldhaXRpbmcgZm9yIGxhcmIgZGV2aWNlICVwT0ZcbiIsIGxhcmJfbm9kZSk7CiAJCW9mX25v ZGVfcHV0KGxhcmJfbm9kZSk7CiAJCXJldHVybiAtRVBST0JFX0RFRkVSOwogCX0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKaW5kZXggNDFkMmNmZmU5NTNlLi5iNjc5MjM1ODlk YzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jCkBAIC0xODcsOCArMTg3 LDggQEAgc3RhdGljIGludCBtdGtfZHJtX2ttc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0p CgogCXBkZXYgPSBvZl9maW5kX2RldmljZV9ieV9ub2RlKHByaXZhdGUtPm11dGV4X25vZGUpOwog CWlmICghcGRldikgewotCQlkZXZfZXJyKGRybS0+ZGV2LCAiV2FpdGluZyBmb3IgZGlzcC1tdXRl eCBkZXZpY2UgJXNcbiIsCi0JCQlwcml2YXRlLT5tdXRleF9ub2RlLT5mdWxsX25hbWUpOworCQlk ZXZfZXJyKGRybS0+ZGV2LCAiV2FpdGluZyBmb3IgZGlzcC1tdXRleCBkZXZpY2UgJXBPRlxuIiwK KwkJCXByaXZhdGUtPm11dGV4X25vZGUpOwogCQlvZl9ub2RlX3B1dChwcml2YXRlLT5tdXRleF9u b2RlKTsKIAkJcmV0dXJuIC1FUFJPQkVfREVGRVI7CiAJfQpAQCAtNDE3LDggKzQxNyw4IEBAIHN0 YXRpYyBpbnQgbXRrX2RybV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCQkJ Y29udGludWU7CgogCQlpZiAoIW9mX2RldmljZV9pc19hdmFpbGFibGUobm9kZSkpIHsKLQkJCWRl dl9kYmcoZGV2LCAiU2tpcHBpbmcgZGlzYWJsZWQgY29tcG9uZW50ICVzXG4iLAotCQkJCW5vZGUt PmZ1bGxfbmFtZSk7CisJCQlkZXZfZGJnKGRldiwgIlNraXBwaW5nIGRpc2FibGVkIGNvbXBvbmVu dCAlcE9GXG4iLAorCQkJCW5vZGUpOwogCQkJY29udGludWU7CiAJCX0KCkBAIC00MzEsOCArNDMx LDggQEAgc3RhdGljIGludCBtdGtfZHJtX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYpCgogCQljb21wX2lkID0gbXRrX2RkcF9jb21wX2dldF9pZChub2RlLCBjb21wX3R5cGUpOwog CQlpZiAoY29tcF9pZCA8IDApIHsKLQkJCWRldl93YXJuKGRldiwgIlNraXBwaW5nIHVua25vd24g Y29tcG9uZW50ICVzXG4iLAotCQkJCSBub2RlLT5mdWxsX25hbWUpOworCQkJZGV2X3dhcm4oZGV2 LCAiU2tpcHBpbmcgdW5rbm93biBjb21wb25lbnQgJXBPRlxuIiwKKwkJCQkgbm9kZSk7CiAJCQlj b250aW51ZTsKIAkJfQoKQEAgLTQ0OCw4ICs0NDgsOCBAQCBzdGF0aWMgaW50IG10a19kcm1fcHJv YmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJICAgIGNvbXBfdHlwZSA9PSBNVEtf RElTUF9SRE1BIHx8CiAJCSAgICBjb21wX3R5cGUgPT0gTVRLX0RTSSB8fAogCQkgICAgY29tcF90 eXBlID09IE1US19EUEkpIHsKLQkJCWRldl9pbmZvKGRldiwgIkFkZGluZyBjb21wb25lbnQgbWF0 Y2ggZm9yICVzXG4iLAotCQkJCSBub2RlLT5mdWxsX25hbWUpOworCQkJZGV2X2luZm8oZGV2LCAi QWRkaW5nIGNvbXBvbmVudCBtYXRjaCBmb3IgJXBPRlxuIiwKKwkJCQkgbm9kZSk7CiAJCQlkcm1f b2ZfY29tcG9uZW50X21hdGNoX2FkZChkZXYsICZtYXRjaCwgY29tcGFyZV9vZiwKIAkJCQkJCSAg IG5vZGUpOwogCQl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVr L210a19kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHNpLmMKaW5kZXggOTcy NTNjOGY4MTNiLi5hMzFiZDJhODJkZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kc2kuYwpA QCAtMTA0OCw4ICsxMDQ4LDggQEAgc3RhdGljIGludCBtdGtfZHNpX2JpbmQoc3RydWN0IGRldmlj ZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCgogCXJldCA9IG10a19k ZHBfY29tcF9yZWdpc3Rlcihkcm0sICZkc2ktPmRkcF9jb21wKTsKIAlpZiAocmV0IDwgMCkgewot CQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byByZWdpc3RlciBjb21wb25lbnQgJXM6ICVkXG4iLAot CQkJZGV2LT5vZl9ub2RlLT5mdWxsX25hbWUsIHJldCk7CisJCWRldl9lcnIoZGV2LCAiRmFpbGVk IHRvIHJlZ2lzdGVyIGNvbXBvbmVudCAlcE9GOiAlZFxuIiwKKwkJCWRldi0+b2Zfbm9kZSwgcmV0 KTsKIAkJcmV0dXJuIHJldDsKIAl9CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlh dGVrL210a19oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2hkbWkuYwppbmRl eCA3MWViNGZiYmZjODUuLmZlZjI0NmMyNTc3YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21lZGlhdGVrL210a19oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19o ZG1pLmMKQEAgLTE0NTYsOCArMTQ1Niw4IEBAIHN0YXRpYyBpbnQgbXRrX2hkbWlfZHRfcGFyc2Vf cGRhdGEoc3RydWN0IG10a19oZG1pICpoZG1pLAoKIAljZWNfcGRldiA9IG9mX2ZpbmRfZGV2aWNl X2J5X25vZGUoY2VjX25wKTsKIAlpZiAoIWNlY19wZGV2KSB7Ci0JCWRldl9lcnIoaGRtaS0+ZGV2 LCAiV2FpdGluZyBmb3IgQ0VDIGRldmljZSAlc1xuIiwKLQkJCWNlY19ucC0+ZnVsbF9uYW1lKTsK KwkJZGV2X2VycihoZG1pLT5kZXYsICJXYWl0aW5nIGZvciBDRUMgZGV2aWNlICVwT0ZcbiIsCisJ CQljZWNfbnApOwogCQlyZXR1cm4gLUVQUk9CRV9ERUZFUjsKIAl9CiAJaGRtaS0+Y2VjX2RldiA9 ICZjZWNfcGRldi0+ZGV2OwpAQCAtMTUwMSw4ICsxNTAxLDggQEAgc3RhdGljIGludCBtdGtfaGRt aV9kdF9wYXJzZV9wZGF0YShzdHJ1Y3QgbXRrX2hkbWkgKmhkbWksCgogCWkyY19ucCA9IG9mX3Bh cnNlX3BoYW5kbGUocmVtb3RlLCAiZGRjLWkyYy1idXMiLCAwKTsKIAlpZiAoIWkyY19ucCkgewot CQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byBmaW5kIGRkYy1pMmMtYnVzIG5vZGUgaW4gJXNcbiIs Ci0JCQlyZW1vdGUtPmZ1bGxfbmFtZSk7CisJCWRldl9lcnIoZGV2LCAiRmFpbGVkIHRvIGZpbmQg ZGRjLWkyYy1idXMgbm9kZSBpbiAlcE9GXG4iLAorCQkJcmVtb3RlKTsKIAkJb2Zfbm9kZV9wdXQo cmVtb3RlKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL21lc29uL21lc29uX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5j CmluZGV4IDRkOThmYWM5Mjc5NS4uNTM3NWU2ZGNjZGQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbWVzb24vbWVzb25fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29u X2Rydi5jCkBAIC0zMDMsOSArMzAzLDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBjb21wb25lbnRf bWFzdGVyX29wcyBtZXNvbl9kcnZfbWFzdGVyX29wcyA9IHsKCiBzdGF0aWMgaW50IGNvbXBhcmVf b2Yoc3RydWN0IGRldmljZSAqZGV2LCB2b2lkICpkYXRhKQogewotCURSTV9ERUJVR19EUklWRVIo IkNvbXBhcmluZyBvZiBub2RlICVzIHdpdGggJXNcbiIsCi0JCQkgb2Zfbm9kZV9mdWxsX25hbWUo ZGV2LT5vZl9ub2RlKSwKLQkJCSBvZl9ub2RlX2Z1bGxfbmFtZShkYXRhKSk7CisJRFJNX0RFQlVH X0RSSVZFUigiQ29tcGFyaW5nIG9mIG5vZGUgJXBPRiB3aXRoICVwT0ZcbiIsCisJCQkgZGV2LT5v Zl9ub2RlLCBkYXRhKTsKCiAJcmV0dXJuIGRldi0+b2Zfbm9kZSA9PSBkYXRhOwogfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3BhbmVsL3BhbmVsLWx2ZHMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9wYW5lbC9wYW5lbC1sdmRzLmMKaW5kZXggMzIxNmFhOWE4OGQ2Li5lMmQ1N2MwMTIwMGIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5lbC9wYW5lbC1sdmRzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3BhbmVsL3BhbmVsLWx2ZHMuYwpAQCAtMTQzLDE0ICsxNDMsMTQgQEAgc3RhdGlj IGludCBwYW5lbF9sdmRzX3BhcnNlX2R0KHN0cnVjdCBwYW5lbF9sdmRzICpsdmRzKQoKIAlyZXQg PSBvZl9wcm9wZXJ0eV9yZWFkX3UzMihucCwgIndpZHRoLW1tIiwgJmx2ZHMtPndpZHRoKTsKIAlp ZiAocmV0IDwgMCkgewotCQlkZXZfZXJyKGx2ZHMtPmRldiwgIiVzOiBpbnZhbGlkIG9yIG1pc3Np bmcgJXMgRFQgcHJvcGVydHlcbiIsCi0JCQlvZl9ub2RlX2Z1bGxfbmFtZShucCksICJ3aWR0aC1t bSIpOworCQlkZXZfZXJyKGx2ZHMtPmRldiwgIiVwT0Y6IGludmFsaWQgb3IgbWlzc2luZyAlcyBE VCBwcm9wZXJ0eVxuIiwKKwkJCW5wLCAid2lkdGgtbW0iKTsKIAkJcmV0dXJuIC1FTk9ERVY7CiAJ fQogCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAiaGVpZ2h0LW1tIiwgJmx2ZHMtPmhl aWdodCk7CiAJaWYgKHJldCA8IDApIHsKLQkJZGV2X2VycihsdmRzLT5kZXYsICIlczogaW52YWxp ZCBvciBtaXNzaW5nICVzIERUIHByb3BlcnR5XG4iLAotCQkJb2Zfbm9kZV9mdWxsX25hbWUobnAp LCAiaGVpZ2h0LW1tIik7CisJCWRldl9lcnIobHZkcy0+ZGV2LCAiJXBPRjogaW52YWxpZCBvciBt aXNzaW5nICVzIERUIHByb3BlcnR5XG4iLAorCQkJbnAsICJoZWlnaHQtbW0iKTsKIAkJcmV0dXJu IC1FTk9ERVY7CiAJfQoKQEAgLTE1OCw4ICsxNTgsOCBAQCBzdGF0aWMgaW50IHBhbmVsX2x2ZHNf cGFyc2VfZHQoc3RydWN0IHBhbmVsX2x2ZHMgKmx2ZHMpCgogCXJldCA9IG9mX3Byb3BlcnR5X3Jl YWRfc3RyaW5nKG5wLCAiZGF0YS1tYXBwaW5nIiwgJm1hcHBpbmcpOwogCWlmIChyZXQgPCAwKSB7 Ci0JCWRldl9lcnIobHZkcy0+ZGV2LCAiJXM6IGludmFsaWQgb3IgbWlzc2luZyAlcyBEVCBwcm9w ZXJ0eVxuIiwKLQkJCW9mX25vZGVfZnVsbF9uYW1lKG5wKSwgImRhdGEtbWFwcGluZyIpOworCQlk ZXZfZXJyKGx2ZHMtPmRldiwgIiVwT0Y6IGludmFsaWQgb3IgbWlzc2luZyAlcyBEVCBwcm9wZXJ0 eVxuIiwKKwkJCW5wLCAiZGF0YS1tYXBwaW5nIik7CiAJCXJldHVybiAtRU5PREVWOwogCX0KCkBA IC0xNzAsOCArMTcwLDggQEAgc3RhdGljIGludCBwYW5lbF9sdmRzX3BhcnNlX2R0KHN0cnVjdCBw YW5lbF9sdmRzICpsdmRzKQogCX0gZWxzZSBpZiAoIXN0cmNtcChtYXBwaW5nLCAidmVzYS0yNCIp KSB7CiAJCWx2ZHMtPmJ1c19mb3JtYXQgPSBNRURJQV9CVVNfRk1UX1JHQjg4OF8xWDdYNF9TUFdH OwogCX0gZWxzZSB7Ci0JCWRldl9lcnIobHZkcy0+ZGV2LCAiJXM6IGludmFsaWQgb3IgbWlzc2lu ZyAlcyBEVCBwcm9wZXJ0eVxuIiwKLQkJCW9mX25vZGVfZnVsbF9uYW1lKG5wKSwgImRhdGEtbWFw cGluZyIpOworCQlkZXZfZXJyKGx2ZHMtPmRldiwgIiVwT0Y6IGludmFsaWQgb3IgbWlzc2luZyAl cyBEVCBwcm9wZXJ0eVxuIiwKKwkJCW5wLCAiZGF0YS1tYXBwaW5nIik7CiAJCXJldHVybiAtRUlO VkFMOwogCX0KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2Vu Y29kZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZW5jb2Rlci5jCmluZGV4 IDNlMDQ4ZGQ5OGI2NC4uYmE4ZDI4MDRjMWQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v cmNhci1kdS9yY2FyX2R1X2VuY29kZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9y Y2FyX2R1X2VuY29kZXIuYwpAQCAtMTg2LDggKzE4Niw4IEBAIGludCByY2FyX2R1X2VuY29kZXJf aW5pdChzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUsCiAJfQoKIAlpZiAoZW5jX25vZGUpIHsK LQkJZGV2X2RiZyhyY2R1LT5kZXYsICJpbml0aWFsaXppbmcgZW5jb2RlciAlcyBmb3Igb3V0cHV0 ICV1XG4iLAotCQkJb2Zfbm9kZV9mdWxsX25hbWUoZW5jX25vZGUpLCBvdXRwdXQpOworCQlkZXZf ZGJnKHJjZHUtPmRldiwgImluaXRpYWxpemluZyBlbmNvZGVyICVwT0YgZm9yIG91dHB1dCAldVxu IiwKKwkJCWVuY19ub2RlLCBvdXRwdXQpOwoKIAkJLyogTG9jYXRlIHRoZSBEUk0gYnJpZGdlIGZy b20gdGhlIGVuY29kZXIgRFQgbm9kZS4gKi8KIAkJYnJpZGdlID0gb2ZfZHJtX2ZpbmRfYnJpZGdl KGVuY19ub2RlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVf a21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2ttcy5jCmluZGV4IGY0MTI1 YzhjYTkwMi4uNWQ2ODFlYTUzYmU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1k dS9yY2FyX2R1X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21z LmMKQEAgLTI5NywxNSArMjk3LDE1IEBAIHN0YXRpYyBpbnQgcmNhcl9kdV9lbmNvZGVyc19pbml0 X29uZShzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUsCiAJICovCiAJZW50aXR5ID0gb2ZfZ3Jh cGhfZ2V0X3JlbW90ZV9wb3J0X3BhcmVudChlcC0+bG9jYWxfbm9kZSk7CiAJaWYgKCFlbnRpdHkp IHsKLQkJZGV2X2RiZyhyY2R1LT5kZXYsICJ1bmNvbm5lY3RlZCBlbmRwb2ludCAlcywgc2tpcHBp bmdcbiIsCi0JCQllcC0+bG9jYWxfbm9kZS0+ZnVsbF9uYW1lKTsKKwkJZGV2X2RiZyhyY2R1LT5k ZXYsICJ1bmNvbm5lY3RlZCBlbmRwb2ludCAlcE9GLCBza2lwcGluZ1xuIiwKKwkJCWVwLT5sb2Nh bF9ub2RlKTsKIAkJcmV0dXJuIC1FTk9ERVY7CiAJfQoKIAlpZiAoIW9mX2RldmljZV9pc19hdmFp bGFibGUoZW50aXR5KSkgewogCQlkZXZfZGJnKHJjZHUtPmRldiwKLQkJCSJjb25uZWN0ZWQgZW50 aXR5ICVzIGlzIGRpc2FibGVkLCBza2lwcGluZ1xuIiwKLQkJCWVudGl0eS0+ZnVsbF9uYW1lKTsK KwkJCSJjb25uZWN0ZWQgZW50aXR5ICVwT0YgaXMgZGlzYWJsZWQsIHNraXBwaW5nXG4iLAorCQkJ ZW50aXR5KTsKIAkJcmV0dXJuIC1FTk9ERVY7CiAJfQoKQEAgLTMyNSw4ICszMjUsOCBAQCBzdGF0 aWMgaW50IHJjYXJfZHVfZW5jb2RlcnNfaW5pdF9vbmUoc3RydWN0IHJjYXJfZHVfZGV2aWNlICpy Y2R1LAoKIAkJaWYgKCFjb25uZWN0b3IpIHsKIAkJCWRldl93YXJuKHJjZHUtPmRldiwKLQkJCQkg Im5vIGNvbm5lY3RvciBmb3IgZW5jb2RlciAlcywgc2tpcHBpbmdcbiIsCi0JCQkJIGVuY29kZXIt PmZ1bGxfbmFtZSk7CisJCQkJICJubyBjb25uZWN0b3IgZm9yIGVuY29kZXIgJXBPRiwgc2tpcHBp bmdcbiIsCisJCQkJIGVuY29kZXIpOwogCQkJb2Zfbm9kZV9wdXQoZW50aXR5X2VwX25vZGUpOwog CQkJb2Zfbm9kZV9wdXQoZW5jb2Rlcik7CiAJCQlyZXR1cm4gLUVOT0RFVjsKQEAgLTM0OCw4ICsz NDgsOCBAQCBzdGF0aWMgaW50IHJjYXJfZHVfZW5jb2RlcnNfaW5pdF9vbmUoc3RydWN0IHJjYXJf ZHVfZGV2aWNlICpyY2R1LAogCXJldCA9IHJjYXJfZHVfZW5jb2Rlcl9pbml0KHJjZHUsIG91dHB1 dCwgZW5jb2RlciwgY29ubmVjdG9yKTsKIAlpZiAocmV0ICYmIHJldCAhPSAtRVBST0JFX0RFRkVS KQogCQlkZXZfd2FybihyY2R1LT5kZXYsCi0JCQkgImZhaWxlZCB0byBpbml0aWFsaXplIGVuY29k ZXIgJXMgb24gb3V0cHV0ICV1ICglZCksIHNraXBwaW5nXG4iLAotCQkJIG9mX25vZGVfZnVsbF9u YW1lKGVuY29kZXIpLCBvdXRwdXQsIHJldCk7CisJCQkgImZhaWxlZCB0byBpbml0aWFsaXplIGVu Y29kZXIgJXBPRiBvbiBvdXRwdXQgJXUgKCVkKSwgc2tpcHBpbmdcbiIsCisJCQkgZW5jb2Rlciwg b3V0cHV0LCByZXQpOwoKIAlvZl9ub2RlX3B1dChlbmNvZGVyKTsKIAlvZl9ub2RlX3B1dChjb25u ZWN0b3IpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2Ry bV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKaW5k ZXggYzZiMWI3ZjNhMmEzLi4wMjQxMDQyOWVkZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL3JvY2tjaGlwX2RybV9kcnYuYwpAQCAtMzcwLDggKzM3MCw4IEBAIHN0YXRpYyBpbnQgcm9j a2NoaXBfZHJtX3BsYXRmb3JtX29mX3Byb2JlKHN0cnVjdCBkZXZpY2UgKmRldikKCiAJCWlvbW11 ID0gb2ZfcGFyc2VfcGhhbmRsZShwb3J0LT5wYXJlbnQsICJpb21tdXMiLCAwKTsKIAkJaWYgKCFp b21tdSB8fCAhb2ZfZGV2aWNlX2lzX2F2YWlsYWJsZShpb21tdS0+cGFyZW50KSkgewotCQkJZGV2 X2RiZyhkZXYsICJubyBpb21tdSBhdHRhY2hlZCBmb3IgJXMsIHVzaW5nIG5vbi1pb21tdSBidWZm ZXJzXG4iLAotCQkJCXBvcnQtPnBhcmVudC0+ZnVsbF9uYW1lKTsKKwkJCWRldl9kYmcoZGV2LCAi bm8gaW9tbXUgYXR0YWNoZWQgZm9yICVwT0YsIHVzaW5nIG5vbi1pb21tdSBidWZmZXJzXG4iLAor CQkJCXBvcnQtPnBhcmVudCk7CiAJCQkvKgogCQkJICogaWYgdGhlcmUgaXMgYSBjcnRjIG5vdCBz dXBwb3J0IGlvbW11LCBmb3JjZSBzZXQgYWxsCiAJCQkgKiBjcnRjIHVzZSBub24taW9tbXUgYnVm ZmVyLgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92 b3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKaW5kZXgg NWQ0NTAzMzJjMmZkLi5hYTM0MDdmMTNiYmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9y b2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV92b3AuYwpAQCAtMTM0MCw4ICsxMzQwLDggQEAgc3RhdGljIGludCB2b3Bf Y3JlYXRlX2NydGMoc3RydWN0IHZvcCAqdm9wKQoKIAlwb3J0ID0gb2ZfZ2V0X2NoaWxkX2J5X25h bWUoZGV2LT5vZl9ub2RlLCAicG9ydCIpOwogCWlmICghcG9ydCkgewotCQlEUk1fREVWX0VSUk9S KHZvcC0+ZGV2LCAibm8gcG9ydCBub2RlIGZvdW5kIGluICVzXG4iLAotCQkJICAgICAgZGV2LT5v Zl9ub2RlLT5mdWxsX25hbWUpOworCQlEUk1fREVWX0VSUk9SKHZvcC0+ZGV2LCAibm8gcG9ydCBu b2RlIGZvdW5kIGluICVwT0ZcbiIsCisJCQkgICAgICBkZXYtPm9mX25vZGUpOwogCQlyZXQgPSAt RU5PRU5UOwogCQlnb3RvIGVycl9jbGVhbnVwX2NydGM7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3N0bS9sdGRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuYwppbmRleCAx Yjk0ODNkNGYyYTQuLmNkNGU3NDc0M2Q3NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3N0 bS9sdGRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMKQEAgLTk5NSw4ICs5OTUs NyBAQCBzdGF0aWMgc3RydWN0IGRybV9wYW5lbCAqbHRkY19nZXRfcGFuZWwoc3RydWN0IGRybV9k ZXZpY2UgKmRkZXYpCiAJCQlwYW5lbCA9IG9mX2RybV9maW5kX3BhbmVsKHBvcnQpOwogCQkJb2Zf bm9kZV9wdXQocG9ydCk7CiAJCQlpZiAocGFuZWwpIHsKLQkJCQlEUk1fREVCVUdfRFJJVkVSKCJy ZW1vdGUgcGFuZWwgJXNcbiIsCi0JCQkJCQkgcG9ydC0+ZnVsbF9uYW1lKTsKKwkJCQlEUk1fREVC VUdfRFJJVkVSKCJyZW1vdGUgcGFuZWwgJXBPRlxuIiwgcG9ydCk7CiAJCQl9IGVsc2UgewogCQkJ CURSTV9ERUJVR19EUklWRVIoInBhbmVsIG1pc3NpbmdcbiIpOwogCQkJCW9mX25vZGVfcHV0KGVu dGl0eSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMKaW5kZXggYWJjN2Q4ZmUwNmI0Li44OWNk NTkwNzIzYWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9kcnYuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfZHJ2LmMKQEAgLTE4Nyw5ICsxODcsOSBA QCBzdGF0aWMgYm9vbCBzdW40aV9kcnZfbm9kZV9pc190Y29uKHN0cnVjdCBkZXZpY2Vfbm9kZSAq bm9kZSkKCiBzdGF0aWMgaW50IGNvbXBhcmVfb2Yoc3RydWN0IGRldmljZSAqZGV2LCB2b2lkICpk YXRhKQogewotCURSTV9ERUJVR19EUklWRVIoIkNvbXBhcmluZyBvZiBub2RlICVzIHdpdGggJXNc biIsCi0JCQkgb2Zfbm9kZV9mdWxsX25hbWUoZGV2LT5vZl9ub2RlKSwKLQkJCSBvZl9ub2RlX2Z1 bGxfbmFtZShkYXRhKSk7CisJRFJNX0RFQlVHX0RSSVZFUigiQ29tcGFyaW5nIG9mIG5vZGUgJXBP RiB3aXRoICVwT0ZcbiIsCisJCQkgZGV2LT5vZl9ub2RlLAorCQkJIGRhdGEpOwoKIAlyZXR1cm4g ZGV2LT5vZl9ub2RlID09IGRhdGE7CiB9CkBAIC0yMTksOCArMjE5LDcgQEAgc3RhdGljIGludCBz dW40aV9kcnZfYWRkX2VuZHBvaW50cyhzdHJ1Y3QgZGV2aWNlICpkZXYsCgogCWlmICghc3VuNGlf ZHJ2X25vZGVfaXNfZnJvbnRlbmQobm9kZSkpIHsKIAkJLyogQWRkIGN1cnJlbnQgY29tcG9uZW50 ICovCi0JCURSTV9ERUJVR19EUklWRVIoIkFkZGluZyBjb21wb25lbnQgJXNcbiIsCi0JCQkJIG9m X25vZGVfZnVsbF9uYW1lKG5vZGUpKTsKKwkJRFJNX0RFQlVHX0RSSVZFUigiQWRkaW5nIGNvbXBv bmVudCAlcE9GXG4iLCBub2RlKTsKIAkJZHJtX29mX2NvbXBvbmVudF9tYXRjaF9hZGQoZGV2LCBt YXRjaCwgY29tcGFyZV9vZiwgbm9kZSk7CiAJCWNvdW50Kys7CiAJfQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3RpbGNkYy90aWxjZGNfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL3RpbGNk Yy90aWxjZGNfY3J0Yy5jCmluZGV4IGQ1MjRlZDBkNTE0Ni4uODQxNmMxZmEwZGQ4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vdGlsY2RjL3RpbGNkY19jcnRjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3RpbGNkYy90aWxjZGNfY3J0Yy5jCkBAIC0xMDM4LDggKzEwMzgsOCBAQCBpbnQgdGls Y2RjX2NydGNfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKHByaXYtPmlzX2Nv bXBvbmVudGl6ZWQpIHsKIAkJY3J0Yy0+cG9ydCA9IG9mX2dyYXBoX2dldF9wb3J0X2J5X2lkKGRl di0+ZGV2LT5vZl9ub2RlLCAwKTsKIAkJaWYgKCFjcnRjLT5wb3J0KSB7IC8qIFRoaXMgc2hvdWxk IG5ldmVyIGhhcHBlbiAqLwotCQkJZGV2X2VycihkZXYtPmRldiwgIlBvcnQgbm9kZSBub3QgZm91 bmQgaW4gJXNcbiIsCi0JCQkJZGV2LT5kZXYtPm9mX25vZGUtPmZ1bGxfbmFtZSk7CisJCQlkZXZf ZXJyKGRldi0+ZGV2LCAiUG9ydCBub2RlIG5vdCBmb3VuZCBpbiAlcE9GXG4iLAorCQkJCWRldi0+ ZGV2LT5vZl9ub2RlKTsKIAkJCXJldCA9IC1FSU5WQUw7CiAJCQlnb3RvIGZhaWw7CiAJCX0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2lwdS12My9pcHUtY29tbW9uLmMgYi9kcml2ZXJzL2dwdS9p cHUtdjMvaXB1LWNvbW1vbi5jCmluZGV4IDk2MGQ4MTZhZDdmNy4uNmE1NzNkMjFkM2NjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9pcHUtdjMvaXB1LWNvbW1vbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2lwdS12My9pcHUtY29tbW9uLmMKQEAgLTEyMTcsOCArMTIxNyw4IEBAIHN0YXRpYyBpbnQgaXB1 X2FkZF9jbGllbnRfZGV2aWNlcyhzdHJ1Y3QgaXB1X3NvYyAqaXB1LCB1bnNpZ25lZCBsb25nIGlw dV9iYXNlKQogCQlvZl9ub2RlID0gb2ZfZ3JhcGhfZ2V0X3BvcnRfYnlfaWQoZGV2LT5vZl9ub2Rl LCBpKTsKIAkJaWYgKCFvZl9ub2RlKSB7CiAJCQlkZXZfaW5mbyhkZXYsCi0JCQkJICJubyBwb3J0 QCVkIG5vZGUgaW4gJXMsIG5vdCB1c2luZyAlcyVkXG4iLAotCQkJCSBpLCBkZXYtPm9mX25vZGUt PmZ1bGxfbmFtZSwKKwkJCQkgIm5vIHBvcnRAJWQgbm9kZSBpbiAlcE9GLCBub3QgdXNpbmcgJXMl ZFxuIiwKKwkJCQkgaSwgZGV2LT5vZl9ub2RlLAogCQkJCSAoaSAvIDIpID8gIkRJIiA6ICJDU0ki LCBpICUgMik7CiAJCQljb250aW51ZTsKIAkJfQotLQoyLjExLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Rob Herring To: Daniel Vetter , Sean Paul Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Russell King , David Airlie , Jani Nikula , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , CK Hu , Philipp Zabel , Matthias Brugger , Neil Armstrong , Carlo Caione , Kevin Hilman , Thierry Reding , Laurent Pinchart , Mark Yao , Heiko Stuebner , Maxime Ripard , Chen-Yu Tsai , Jyri Sarha , Tomi Valkeinen , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH] gpu: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:04 -0500 Message-Id: <20170718214339.7774-24-robh@kernel.org> Sender: devicetree-owner@vger.kernel.org List-ID: 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 Cc: Russell King Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: Javier Martinez Canillas Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: Neil Armstrong Cc: Carlo Caione Cc: Kevin Hilman Cc: Thierry Reding Cc: Laurent Pinchart Cc: Mark Yao Cc: Heiko Stuebner Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Jyri Sarha Cc: Tomi Valkeinen 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 --- drivers/gpu/drm/armada/armada_crtc.c | 3 +-- drivers/gpu/drm/armada/armada_drv.c | 4 ++-- drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- drivers/gpu/drm/drm_modes.c | 4 ++-- drivers/gpu/drm/drm_of.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 +-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 +++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 6 ++---- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++-------- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 ++++---- drivers/gpu/drm/meson/meson_drv.c | 5 ++--- drivers/gpu/drm/panel/panel-lvds.c | 16 ++++++++-------- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++-- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 16 ++++++++-------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- drivers/gpu/drm/stm/ltdc.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 9 ++++----- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 ++-- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 26 files changed, 73 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 4fe19fde84f9..85977c08879e 100644 --- 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 e618fab7f519..0b3227c039d7 100644 --- 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 1160a579e0dc..4b47226b90d4 100644 --- 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", ®); 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 f2493b9b82e6..a7f2a81c76f7 100644 --- 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 2120f33bdf4a..8dafbdfcd2ea 100644 --- 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 a11b79596e2f..f580be170089 100644 --- 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 c96c228a9898..a9e6db024131 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -583,8 +583,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 ef79a6d55646..f609b62b8be6 100644 --- 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 35bc5babdbf7..978782a77629 100644 --- 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 b68a51376f83..585943c81e1f 100644 --- 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 32ca351ecd09..e80a603e5fb0 100644 --- 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 cb32c9369f3a..9fa2e3d217c1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -577,8 +577,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; } @@ -586,8 +585,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 07d7ea2268ef..4672317e3ad1 100644 --- 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 41d2cffe953e..b67923589dc2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -187,8 +187,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; } @@ -417,8 +417,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; } @@ -431,8 +431,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; } @@ -448,8 +448,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 97253c8f813b..a31bd2a82de5 100644 --- 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 71eb4fbbfc85..fef246c2577c 100644 --- 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 4d98fac92795..5375e6dccdd7 100644 --- 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 3216aa9a88d6..e2d57c01200b 100644 --- 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 3e048dd98b64..ba8d2804c1d1 100644 --- 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 f4125c8ca902..5d681ea53be6 100644 --- 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 c6b1b7f3a2a3..02410429edf7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -370,8 +370,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 5d450332c2fd..aa3407f13bbd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1340,8 +1340,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/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 1b9483d4f2a4..cd4e74743d77 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -995,8 +995,7 @@ static struct drm_panel *ltdc_get_panel(struct drm_device *ddev) panel = of_drm_find_panel(port); of_node_put(port); if (panel) { - DRM_DEBUG_DRIVER("remote panel %s\n", - port->full_name); + DRM_DEBUG_DRIVER("remote panel %pOF\n", port); } else { DRM_DEBUG_DRIVER("panel missing\n"); of_node_put(entity); diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index abc7d8fe06b4..89cd590723ac 100644 --- 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 d524ed0d5146..8416c1fa0dd8 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -1038,8 +1038,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 960d816ad7f7..6a573d21d3cc 100644 --- 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; } -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: robh@kernel.org (Rob Herring) Date: Tue, 18 Jul 2017 16:43:04 -0500 Subject: [PATCH] gpu: Convert to using %pOF instead of full_name Message-ID: <20170718214339.7774-24-robh@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Cc: Russell King Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: Javier Martinez Canillas Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: Neil Armstrong Cc: Carlo Caione Cc: Kevin Hilman Cc: Thierry Reding Cc: Laurent Pinchart Cc: Mark Yao Cc: Heiko Stuebner Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Jyri Sarha Cc: Tomi Valkeinen Cc: dri-devel at lists.freedesktop.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-samsung-soc at vger.kernel.org Cc: linux-mediatek at lists.infradead.org Cc: linux-amlogic at lists.infradead.org Cc: linux-renesas-soc at vger.kernel.org Cc: linux-rockchip at lists.infradead.org --- drivers/gpu/drm/armada/armada_crtc.c | 3 +-- drivers/gpu/drm/armada/armada_drv.c | 4 ++-- drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- drivers/gpu/drm/drm_modes.c | 4 ++-- drivers/gpu/drm/drm_of.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 +-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 +++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 6 ++---- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++-------- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 ++-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 ++++---- drivers/gpu/drm/meson/meson_drv.c | 5 ++--- drivers/gpu/drm/panel/panel-lvds.c | 16 ++++++++-------- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++-- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 16 ++++++++-------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- drivers/gpu/drm/stm/ltdc.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 9 ++++----- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 ++-- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 26 files changed, 73 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 4fe19fde84f9..85977c08879e 100644 --- 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 e618fab7f519..0b3227c039d7 100644 --- 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 1160a579e0dc..4b47226b90d4 100644 --- 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", ®); 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 f2493b9b82e6..a7f2a81c76f7 100644 --- 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 2120f33bdf4a..8dafbdfcd2ea 100644 --- 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 a11b79596e2f..f580be170089 100644 --- 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 c96c228a9898..a9e6db024131 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -583,8 +583,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 ef79a6d55646..f609b62b8be6 100644 --- 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 35bc5babdbf7..978782a77629 100644 --- 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 b68a51376f83..585943c81e1f 100644 --- 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 32ca351ecd09..e80a603e5fb0 100644 --- 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 cb32c9369f3a..9fa2e3d217c1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -577,8 +577,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; } @@ -586,8 +585,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 07d7ea2268ef..4672317e3ad1 100644 --- 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 41d2cffe953e..b67923589dc2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -187,8 +187,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; } @@ -417,8 +417,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; } @@ -431,8 +431,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; } @@ -448,8 +448,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 97253c8f813b..a31bd2a82de5 100644 --- 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 71eb4fbbfc85..fef246c2577c 100644 --- 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 4d98fac92795..5375e6dccdd7 100644 --- 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 3216aa9a88d6..e2d57c01200b 100644 --- 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 3e048dd98b64..ba8d2804c1d1 100644 --- 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 f4125c8ca902..5d681ea53be6 100644 --- 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 c6b1b7f3a2a3..02410429edf7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -370,8 +370,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 5d450332c2fd..aa3407f13bbd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1340,8 +1340,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/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 1b9483d4f2a4..cd4e74743d77 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -995,8 +995,7 @@ static struct drm_panel *ltdc_get_panel(struct drm_device *ddev) panel = of_drm_find_panel(port); of_node_put(port); if (panel) { - DRM_DEBUG_DRIVER("remote panel %s\n", - port->full_name); + DRM_DEBUG_DRIVER("remote panel %pOF\n", port); } else { DRM_DEBUG_DRIVER("panel missing\n"); of_node_put(entity); diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index abc7d8fe06b4..89cd590723ac 100644 --- 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 d524ed0d5146..8416c1fa0dd8 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -1038,8 +1038,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 960d816ad7f7..6a573d21d3cc 100644 --- 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; } -- 2.11.0