mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 01:21:01 +07:00
drm: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@armlinux.org.uk> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Kukjin Kim <kgene@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Javier Martinez Canillas <javier@osg.samsung.com> Cc: Xinliang Liu <z.liuxinliang@hisilicon.com> Cc: Rongrong Zou <zourongrong@gmail.com> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Chen Feng <puck.chen@hisilicon.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Carlo Caione <carlo@caione.org> Cc: Kevin Hilman <khilman@baylibre.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Mark Yao <mark.yao@rock-chips.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Jyri Sarha <jsarha@ti.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Partially-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> [seanpaul changed subject prefix and fixed conflict in stm/ltdc.c] Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
af05559854
commit
4bf99144d2
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -585,8 +585,7 @@ static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
|
||||
*/
|
||||
port = of_get_child_by_name(dev->dev->of_node, "port");
|
||||
if (!port) {
|
||||
DRM_ERROR("no port node found in %s\n",
|
||||
dev->dev->of_node->full_name);
|
||||
DRM_ERROR("no port node found in %pOF\n", dev->dev->of_node);
|
||||
return -EINVAL;
|
||||
}
|
||||
of_node_put(port);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -579,8 +579,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
|
||||
node = priv->comp_node[comp_id];
|
||||
comp = priv->ddp_comp[comp_id];
|
||||
if (!comp) {
|
||||
dev_err(dev, "Component %s not initialized\n",
|
||||
node->full_name);
|
||||
dev_err(dev, "Component %pOF not initialized\n", node);
|
||||
ret = -ENODEV;
|
||||
goto unprepare;
|
||||
}
|
||||
@ -588,8 +587,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
|
||||
ret = clk_prepare(comp->clk);
|
||||
if (ret) {
|
||||
dev_err(dev,
|
||||
"Failed to prepare clock for component %s: %d\n",
|
||||
node->full_name, ret);
|
||||
"Failed to prepare clock for component %pOF: %d\n",
|
||||
node, ret);
|
||||
goto unprepare;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -192,8 +192,8 @@ static int mtk_drm_kms_init(struct drm_device *drm)
|
||||
|
||||
pdev = of_find_device_by_node(private->mutex_node);
|
||||
if (!pdev) {
|
||||
dev_err(drm->dev, "Waiting for disp-mutex device %s\n",
|
||||
private->mutex_node->full_name);
|
||||
dev_err(drm->dev, "Waiting for disp-mutex device %pOF\n",
|
||||
private->mutex_node);
|
||||
of_node_put(private->mutex_node);
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
@ -421,8 +421,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
|
||||
continue;
|
||||
|
||||
if (!of_device_is_available(node)) {
|
||||
dev_dbg(dev, "Skipping disabled component %s\n",
|
||||
node->full_name);
|
||||
dev_dbg(dev, "Skipping disabled component %pOF\n",
|
||||
node);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -435,8 +435,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
|
||||
|
||||
comp_id = mtk_ddp_comp_get_id(node, comp_type);
|
||||
if (comp_id < 0) {
|
||||
dev_warn(dev, "Skipping unknown component %s\n",
|
||||
node->full_name);
|
||||
dev_warn(dev, "Skipping unknown component %pOF\n",
|
||||
node);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -452,8 +452,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
|
||||
comp_type == MTK_DISP_RDMA ||
|
||||
comp_type == MTK_DSI ||
|
||||
comp_type == MTK_DPI) {
|
||||
dev_info(dev, "Adding component match for %s\n",
|
||||
node->full_name);
|
||||
dev_info(dev, "Adding component match for %pOF\n",
|
||||
node);
|
||||
drm_of_component_match_add(dev, &match, compare_of,
|
||||
node);
|
||||
} else {
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -368,8 +368,8 @@ static int rockchip_drm_platform_of_probe(struct device *dev)
|
||||
|
||||
iommu = of_parse_phandle(port->parent, "iommus", 0);
|
||||
if (!iommu || !of_device_is_available(iommu->parent)) {
|
||||
dev_dbg(dev, "no iommu attached for %s, using non-iommu buffers\n",
|
||||
port->parent->full_name);
|
||||
dev_dbg(dev, "no iommu attached for %pOF, using non-iommu buffers\n",
|
||||
port->parent);
|
||||
/*
|
||||
* if there is a crtc not support iommu, force set all
|
||||
* crtc use non-iommu buffer.
|
||||
|
@ -1343,8 +1343,8 @@ static int vop_create_crtc(struct vop *vop)
|
||||
|
||||
port = of_get_child_by_name(dev->of_node, "port");
|
||||
if (!port) {
|
||||
DRM_DEV_ERROR(vop->dev, "no port node found in %s\n",
|
||||
dev->of_node->full_name);
|
||||
DRM_DEV_ERROR(vop->dev, "no port node found in %pOF\n",
|
||||
dev->of_node);
|
||||
ret = -ENOENT;
|
||||
goto err_cleanup_crtc;
|
||||
}
|
||||
|
@ -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++;
|
||||
}
|
||||
|
@ -1050,8 +1050,8 @@ int tilcdc_crtc_create(struct drm_device *dev)
|
||||
if (priv->is_componentized) {
|
||||
crtc->port = of_graph_get_port_by_id(dev->dev->of_node, 0);
|
||||
if (!crtc->port) { /* This should never happen */
|
||||
dev_err(dev->dev, "Port node not found in %s\n",
|
||||
dev->dev->of_node->full_name);
|
||||
dev_err(dev->dev, "Port node not found in %pOF\n",
|
||||
dev->dev->of_node);
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user