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

media: 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>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Songjun Wu <songjun.wu@microchip.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
Cc: Houlong Wei <houlong.wei@mediatek.com>
Cc: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Hyun Kwon <hyun.kwon@xilinx.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-renesas-soc@vger.kernel.org
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

authored by

Rob Herring and committed by
Mauro Carvalho Chehab
68d9c47b 02b1ce92

+70 -80
+1 -2
drivers/media/i2c/s5c73m3/s5c73m3-core.c
··· 1635 1635 1636 1636 node_ep = of_graph_get_next_endpoint(node, NULL); 1637 1637 if (!node_ep) { 1638 - dev_warn(dev, "no endpoint defined for node: %s\n", 1639 - node->full_name); 1638 + dev_warn(dev, "no endpoint defined for node: %pOF\n", node); 1640 1639 return 0; 1641 1640 } 1642 1641
+3 -4
drivers/media/i2c/s5k5baf.c
··· 1863 1863 1864 1864 node_ep = of_graph_get_next_endpoint(node, NULL); 1865 1865 if (!node_ep) { 1866 - dev_err(dev, "no endpoint defined at node %s\n", 1867 - node->full_name); 1866 + dev_err(dev, "no endpoint defined at node %pOF\n", node); 1868 1867 return -EINVAL; 1869 1868 } 1870 1869 ··· 1881 1882 case V4L2_MBUS_PARALLEL: 1882 1883 break; 1883 1884 default: 1884 - dev_err(dev, "unsupported bus in endpoint defined at node %s\n", 1885 - node->full_name); 1885 + dev_err(dev, "unsupported bus in endpoint defined at node %pOF\n", 1886 + node); 1886 1887 return -EINVAL; 1887 1888 } 1888 1889
+2 -2
drivers/media/platform/am437x/am437x-vpfe.c
··· 2490 2490 2491 2491 rem = of_graph_get_remote_port_parent(endpoint); 2492 2492 if (!rem) { 2493 - dev_err(&pdev->dev, "Remote device at %s not found\n", 2494 - endpoint->full_name); 2493 + dev_err(&pdev->dev, "Remote device at %pOF not found\n", 2494 + endpoint); 2495 2495 goto done; 2496 2496 } 2497 2497
+2 -2
drivers/media/platform/atmel/atmel-isc.c
··· 1700 1700 1701 1701 rem = of_graph_get_remote_port_parent(epn); 1702 1702 if (!rem) { 1703 - dev_notice(dev, "Remote device at %s not found\n", 1704 - of_node_full_name(epn)); 1703 + dev_notice(dev, "Remote device at %pOF not found\n", 1704 + epn); 1705 1705 continue; 1706 1706 } 1707 1707
+8 -8
drivers/media/platform/davinci/vpif_capture.c
··· 1397 1397 vpif_obj.config->chan_config->inputs[i].subdev_name = 1398 1398 (char *)to_of_node(subdev->fwnode)->full_name; 1399 1399 vpif_dbg(2, debug, 1400 - "%s: setting input %d subdev_name = %s\n", 1400 + "%s: setting input %d subdev_name = %pOF\n", 1401 1401 __func__, i, 1402 - to_of_node(subdev->fwnode)->full_name); 1402 + to_of_node(subdev->fwnode)); 1403 1403 return 0; 1404 1404 } 1405 1405 } ··· 1557 1557 dev_err(&pdev->dev, "Could not parse the endpoint\n"); 1558 1558 goto done; 1559 1559 } 1560 - dev_dbg(&pdev->dev, "Endpoint %s, bus_width = %d\n", 1561 - endpoint->full_name, bus_cfg.bus.parallel.bus_width); 1560 + dev_dbg(&pdev->dev, "Endpoint %pOF, bus_width = %d\n", 1561 + endpoint, bus_cfg.bus.parallel.bus_width); 1562 1562 flags = bus_cfg.bus.parallel.flags; 1563 1563 1564 1564 if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) ··· 1569 1569 1570 1570 rem = of_graph_get_remote_port_parent(endpoint); 1571 1571 if (!rem) { 1572 - dev_dbg(&pdev->dev, "Remote device at %s not found\n", 1573 - endpoint->full_name); 1572 + dev_dbg(&pdev->dev, "Remote device at %pOF not found\n", 1573 + endpoint); 1574 1574 goto done; 1575 1575 } 1576 1576 1577 - dev_dbg(&pdev->dev, "Remote device %s, %s found\n", 1578 - rem->name, rem->full_name); 1577 + dev_dbg(&pdev->dev, "Remote device %s, %pOF found\n", 1578 + rem->name, rem); 1579 1579 sdinfo->name = rem->full_name; 1580 1580 1581 1581 pdata->asd[i] = devm_kzalloc(&pdev->dev,
+4 -4
drivers/media/platform/exynos4-is/fimc-is.c
··· 174 174 175 175 sensor->drvdata = fimc_is_sensor_get_drvdata(node); 176 176 if (!sensor->drvdata) { 177 - dev_err(&is->pdev->dev, "no driver data found for: %s\n", 178 - node->full_name); 177 + dev_err(&is->pdev->dev, "no driver data found for: %pOF\n", 178 + node); 179 179 return -EINVAL; 180 180 } 181 181 ··· 191 191 /* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */ 192 192 ret = of_property_read_u32(port, "reg", &tmp); 193 193 if (ret < 0) { 194 - dev_err(&is->pdev->dev, "reg property not found at: %s\n", 195 - port->full_name); 194 + dev_err(&is->pdev->dev, "reg property not found at: %pOF\n", 195 + port); 196 196 of_node_put(port); 197 197 return ret; 198 198 }
+1 -2
drivers/media/platform/exynos4-is/fimc-lite.c
··· 1493 1493 1494 1494 if (!drv_data || fimc->index >= drv_data->num_instances || 1495 1495 fimc->index < 0) { 1496 - dev_err(dev, "Wrong %s node alias\n", 1497 - dev->of_node->full_name); 1496 + dev_err(dev, "Wrong %pOF node alias\n", dev->of_node); 1498 1497 return -EINVAL; 1499 1498 } 1500 1499
+4 -4
drivers/media/platform/exynos4-is/media-dev.c
··· 412 412 rem = of_graph_get_remote_port_parent(ep); 413 413 of_node_put(ep); 414 414 if (rem == NULL) { 415 - v4l2_info(&fmd->v4l2_dev, "Remote device at %s not found\n", 416 - ep->full_name); 415 + v4l2_info(&fmd->v4l2_dev, "Remote device at %pOF not found\n", 416 + ep); 417 417 return 0; 418 418 } 419 419 ··· 430 430 */ 431 431 pd->sensor_bus_type = FIMC_BUS_TYPE_MIPI_CSI2; 432 432 } else { 433 - v4l2_err(&fmd->v4l2_dev, "Wrong port id (%u) at node %s\n", 434 - endpoint.base.port, rem->full_name); 433 + v4l2_err(&fmd->v4l2_dev, "Wrong port id (%u) at node %pOF\n", 434 + endpoint.base.port, rem); 435 435 } 436 436 /* 437 437 * For FIMC-IS handled sensors, that are placed under i2c-isp device
+2 -2
drivers/media/platform/exynos4-is/mipi-csis.c
··· 730 730 731 731 node = of_graph_get_next_endpoint(node, NULL); 732 732 if (!node) { 733 - dev_err(&pdev->dev, "No port node at %s\n", 734 - pdev->dev.of_node->full_name); 733 + dev_err(&pdev->dev, "No port node at %pOF\n", 734 + pdev->dev.of_node); 735 735 return -EINVAL; 736 736 } 737 737 /* Get port node and validate MIPI-CSI channel id. */
+2 -4
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
··· 134 134 larb_node = of_parse_phandle(node, "mediatek,larb", 0); 135 135 if (!larb_node) { 136 136 dev_err(dev, 137 - "Missing mediadek,larb phandle in %s node\n", 138 - node->full_name); 137 + "Missing mediadek,larb phandle in %pOF node\n", node); 139 138 return -EINVAL; 140 139 } 141 140 142 141 larb_pdev = of_find_device_by_node(larb_node); 143 142 if (!larb_pdev) { 144 - dev_warn(dev, "Waiting for larb device %s\n", 145 - larb_node->full_name); 143 + dev_warn(dev, "Waiting for larb device %pOF\n", larb_node); 146 144 of_node_put(larb_node); 147 145 return -EPROBE_DEFER; 148 146 }
+4 -4
drivers/media/platform/mtk-mdp/mtk_mdp_core.c
··· 137 137 continue; 138 138 139 139 if (!of_device_is_available(node)) { 140 - dev_err(dev, "Skipping disabled component %s\n", 141 - node->full_name); 140 + dev_err(dev, "Skipping disabled component %pOF\n", 141 + node); 142 142 continue; 143 143 } 144 144 145 145 comp_type = (enum mtk_mdp_comp_type)of_id->data; 146 146 comp_id = mtk_mdp_comp_get_id(dev, node, comp_type); 147 147 if (comp_id < 0) { 148 - dev_warn(dev, "Skipping unknown component %s\n", 149 - node->full_name); 148 + dev_warn(dev, "Skipping unknown component %pOF\n", 149 + node); 150 150 continue; 151 151 } 152 152
+4 -4
drivers/media/platform/omap3isp/isp.c
··· 2024 2024 if (ret) 2025 2025 return ret; 2026 2026 2027 - dev_dbg(dev, "parsing endpoint %s, interface %u\n", 2028 - to_of_node(fwnode)->full_name, vep.base.port); 2027 + dev_dbg(dev, "parsing endpoint %pOF, interface %u\n", 2028 + to_of_node(fwnode), vep.base.port); 2029 2029 2030 2030 switch (vep.base.port) { 2031 2031 case ISP_OF_PHY_PARALLEL: ··· 2136 2136 break; 2137 2137 2138 2138 default: 2139 - dev_warn(dev, "%s: invalid interface %u\n", 2140 - to_of_node(fwnode)->full_name, vep.base.port); 2139 + dev_warn(dev, "%pOF: invalid interface %u\n", 2140 + to_of_node(fwnode), vep.base.port); 2141 2141 return -EINVAL; 2142 2142 } 2143 2143
+1 -1
drivers/media/platform/pxa_camera.c
··· 2331 2331 asd->match.fwnode.fwnode = of_fwnode_handle(remote); 2332 2332 of_node_put(remote); 2333 2333 } else { 2334 - dev_notice(dev, "no remote for %s\n", of_node_full_name(np)); 2334 + dev_notice(dev, "no remote for %pOF\n", np); 2335 2335 } 2336 2336 2337 2337 out:
+2 -2
drivers/media/platform/rcar-vin/rcar-core.c
··· 222 222 223 223 subdevs[0] = &vin->digital.asd; 224 224 225 - vin_dbg(vin, "Found digital subdevice %s\n", 226 - of_node_full_name(to_of_node(subdevs[0]->match.fwnode.fwnode))); 225 + vin_dbg(vin, "Found digital subdevice %pOF\n", 226 + to_of_node(subdevs[0]->match.fwnode.fwnode)); 227 227 228 228 vin->notifier.num_subdevs = 1; 229 229 vin->notifier.subdevs = subdevs;
+2 -4
drivers/media/platform/soc_camera/soc_camera.c
··· 1550 1550 v4l2_clk_name_i2c(clk_name, sizeof(clk_name), 1551 1551 client->adapter->nr, client->addr); 1552 1552 else 1553 - v4l2_clk_name_of(clk_name, sizeof(clk_name), 1554 - of_node_full_name(remote)); 1553 + v4l2_clk_name_of(clk_name, sizeof(clk_name), remote); 1555 1554 1556 1555 icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd); 1557 1556 if (IS_ERR(icd->clk)) { ··· 1589 1590 1590 1591 ren = of_graph_get_remote_port(epn); 1591 1592 if (!ren) { 1592 - dev_notice(dev, "no remote for %s\n", 1593 - of_node_full_name(epn)); 1593 + dev_notice(dev, "no remote for %pOF\n", epn); 1594 1594 continue; 1595 1595 } 1596 1596
+25 -27
drivers/media/platform/xilinx/xilinx-vipp.c
··· 90 90 of_node_put(ep); 91 91 ep = next; 92 92 93 - dev_dbg(xdev->dev, "processing endpoint %s\n", ep->full_name); 93 + dev_dbg(xdev->dev, "processing endpoint %pOF\n", ep); 94 94 95 95 ret = v4l2_fwnode_parse_link(of_fwnode_handle(ep), &link); 96 96 if (ret < 0) { 97 - dev_err(xdev->dev, "failed to parse link for %s\n", 98 - ep->full_name); 97 + dev_err(xdev->dev, "failed to parse link for %pOF\n", 98 + ep); 99 99 continue; 100 100 } 101 101 ··· 103 103 * the link. 104 104 */ 105 105 if (link.local_port >= local->num_pads) { 106 - dev_err(xdev->dev, "invalid port number %u for %s\n", 106 + dev_err(xdev->dev, "invalid port number %u for %pOF\n", 107 107 link.local_port, 108 - to_of_node(link.local_node)->full_name); 108 + to_of_node(link.local_node)); 109 109 v4l2_fwnode_put_link(&link); 110 110 ret = -EINVAL; 111 111 break; ··· 114 114 local_pad = &local->pads[link.local_port]; 115 115 116 116 if (local_pad->flags & MEDIA_PAD_FL_SINK) { 117 - dev_dbg(xdev->dev, "skipping sink port %s:%u\n", 118 - to_of_node(link.local_node)->full_name, 117 + dev_dbg(xdev->dev, "skipping sink port %pOF:%u\n", 118 + to_of_node(link.local_node), 119 119 link.local_port); 120 120 v4l2_fwnode_put_link(&link); 121 121 continue; ··· 123 123 124 124 /* Skip DMA engines, they will be processed separately. */ 125 125 if (link.remote_node == of_fwnode_handle(xdev->dev->of_node)) { 126 - dev_dbg(xdev->dev, "skipping DMA port %s:%u\n", 127 - to_of_node(link.local_node)->full_name, 126 + dev_dbg(xdev->dev, "skipping DMA port %pOF:%u\n", 127 + to_of_node(link.local_node), 128 128 link.local_port); 129 129 v4l2_fwnode_put_link(&link); 130 130 continue; ··· 134 134 ent = xvip_graph_find_entity(xdev, 135 135 to_of_node(link.remote_node)); 136 136 if (ent == NULL) { 137 - dev_err(xdev->dev, "no entity found for %s\n", 138 - to_of_node(link.remote_node)->full_name); 137 + dev_err(xdev->dev, "no entity found for %pOF\n", 138 + to_of_node(link.remote_node)); 139 139 v4l2_fwnode_put_link(&link); 140 140 ret = -ENODEV; 141 141 break; ··· 144 144 remote = ent->entity; 145 145 146 146 if (link.remote_port >= remote->num_pads) { 147 - dev_err(xdev->dev, "invalid port number %u on %s\n", 148 - link.remote_port, 149 - to_of_node(link.remote_node)->full_name); 147 + dev_err(xdev->dev, "invalid port number %u on %pOF\n", 148 + link.remote_port, to_of_node(link.remote_node)); 150 149 v4l2_fwnode_put_link(&link); 151 150 ret = -EINVAL; 152 151 break; ··· 215 216 of_node_put(ep); 216 217 ep = next; 217 218 218 - dev_dbg(xdev->dev, "processing endpoint %s\n", ep->full_name); 219 + dev_dbg(xdev->dev, "processing endpoint %pOF\n", ep); 219 220 220 221 ret = v4l2_fwnode_parse_link(of_fwnode_handle(ep), &link); 221 222 if (ret < 0) { 222 - dev_err(xdev->dev, "failed to parse link for %s\n", 223 - ep->full_name); 223 + dev_err(xdev->dev, "failed to parse link for %pOF\n", 224 + ep); 224 225 continue; 225 226 } 226 227 ··· 241 242 ent = xvip_graph_find_entity(xdev, 242 243 to_of_node(link.remote_node)); 243 244 if (ent == NULL) { 244 - dev_err(xdev->dev, "no entity found for %s\n", 245 - to_of_node(link.remote_node)->full_name); 245 + dev_err(xdev->dev, "no entity found for %pOF\n", 246 + to_of_node(link.remote_node)); 246 247 v4l2_fwnode_put_link(&link); 247 248 ret = -ENODEV; 248 249 break; 249 250 } 250 251 251 252 if (link.remote_port >= ent->entity->num_pads) { 252 - dev_err(xdev->dev, "invalid port number %u on %s\n", 253 + dev_err(xdev->dev, "invalid port number %u on %pOF\n", 253 254 link.remote_port, 254 - to_of_node(link.remote_node)->full_name); 255 + to_of_node(link.remote_node)); 255 256 v4l2_fwnode_put_link(&link); 256 257 ret = -EINVAL; 257 258 break; ··· 336 337 continue; 337 338 338 339 if (entity->subdev) { 339 - dev_err(xdev->dev, "duplicate subdev for node %s\n", 340 - entity->node->full_name); 340 + dev_err(xdev->dev, "duplicate subdev for node %pOF\n", 341 + entity->node); 341 342 return -EINVAL; 342 343 } 343 344 ··· 359 360 struct device_node *ep = NULL; 360 361 int ret = 0; 361 362 362 - dev_dbg(xdev->dev, "parsing node %s\n", node->full_name); 363 + dev_dbg(xdev->dev, "parsing node %pOF\n", node); 363 364 364 365 while (1) { 365 366 ep = of_graph_get_next_endpoint(node, ep); 366 367 if (ep == NULL) 367 368 break; 368 369 369 - dev_dbg(xdev->dev, "handling endpoint %s\n", ep->full_name); 370 + dev_dbg(xdev->dev, "handling endpoint %pOF\n", ep); 370 371 371 372 remote = of_graph_get_remote_port_parent(ep); 372 373 if (remote == NULL) { ··· 451 452 452 453 ret = xvip_dma_init(xdev, dma, type, index); 453 454 if (ret < 0) { 454 - dev_err(xdev->dev, "%s initialization failed\n", 455 - node->full_name); 455 + dev_err(xdev->dev, "%pOF initialization failed\n", node); 456 456 return ret; 457 457 } 458 458
+1 -2
drivers/media/v4l2-core/v4l2-clk.c
··· 61 61 62 62 /* if dev_name is not found, try use the OF name to find again */ 63 63 if (PTR_ERR(clk) == -ENODEV && dev->of_node) { 64 - v4l2_clk_name_of(clk_name, sizeof(clk_name), 65 - of_node_full_name(dev->of_node)); 64 + v4l2_clk_name_of(clk_name, sizeof(clk_name), dev->of_node); 66 65 clk = v4l2_clk_find(clk_name); 67 66 } 68 67
+2 -2
include/media/v4l2-clk.h
··· 70 70 #define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \ 71 71 "%d-%04x", adap, client) 72 72 73 - #define v4l2_clk_name_of(name, size, of_full_name) snprintf(name, size, \ 74 - "of-%s", of_full_name) 73 + #define v4l2_clk_name_of(name, size, node) snprintf(name, size, \ 74 + "of-%pOF", node) 75 75 76 76 #endif