Commit f764e6d6 authored by Rob Herring's avatar Rob Herring Committed by Mauro Carvalho Chehab

media: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Cc: Benoit Parrot <bparrot@ti.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Hyun Kwon <hyun.kwon@xilinx.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 04b72322
...@@ -1403,8 +1403,8 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np) ...@@ -1403,8 +1403,8 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
ret = of_property_read_u32(child, "input", &input_type); ret = of_property_read_u32(child, "input", &input_type);
if (ret) { if (ret) {
dev_err(decoder->sd.dev, dev_err(decoder->sd.dev,
"missing type property in node %s\n", "missing type property in node %pOFn\n",
child->name); child);
goto err_connector; goto err_connector;
} }
...@@ -1439,8 +1439,8 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np) ...@@ -1439,8 +1439,8 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
ret = of_property_read_string(child, "label", &name); ret = of_property_read_string(child, "label", &name);
if (ret < 0) { if (ret < 0) {
dev_err(decoder->sd.dev, dev_err(decoder->sd.dev,
"missing label property in node %s\n", "missing label property in node %pOFn\n",
child->name); child);
goto err_connector; goto err_connector;
} }
......
...@@ -1585,8 +1585,7 @@ vpif_capture_get_pdata(struct platform_device *pdev) ...@@ -1585,8 +1585,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
goto done; goto done;
} }
dev_dbg(&pdev->dev, "Remote device %s, %pOF found\n", dev_dbg(&pdev->dev, "Remote device %pOF found\n", rem);
rem->name, rem);
sdinfo->name = rem->full_name; sdinfo->name = rem->full_name;
pdata->asd[i] = devm_kzalloc(&pdev->dev, pdata->asd[i] = devm_kzalloc(&pdev->dev,
......
...@@ -1712,8 +1712,8 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) ...@@ -1712,8 +1712,8 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
v4l2_fwnode_endpoint_parse(of_fwnode_handle(remote_ep), endpoint); v4l2_fwnode_endpoint_parse(of_fwnode_handle(remote_ep), endpoint);
if (endpoint->bus_type != V4L2_MBUS_CSI2) { if (endpoint->bus_type != V4L2_MBUS_CSI2) {
ctx_err(ctx, "Port:%d sub-device %s is not a CSI2 device\n", ctx_err(ctx, "Port:%d sub-device %pOFn is not a CSI2 device\n",
inst, sensor_node->name); inst, sensor_node);
goto cleanup_exit; goto cleanup_exit;
} }
...@@ -1732,8 +1732,8 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) ...@@ -1732,8 +1732,8 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
endpoint->bus.mipi_csi2.data_lanes[lane]); endpoint->bus.mipi_csi2.data_lanes[lane]);
ctx_dbg(3, ctx, "\t>\n"); ctx_dbg(3, ctx, "\t>\n");
ctx_dbg(1, ctx, "Port: %d found sub-device %s\n", ctx_dbg(1, ctx, "Port: %d found sub-device %pOFn\n",
inst, sensor_node->name); inst, sensor_node);
ctx->asd_list[0] = asd; ctx->asd_list[0] = asd;
ctx->notifier.subdevs = ctx->asd_list; ctx->notifier.subdevs = ctx->asd_list;
......
...@@ -333,7 +333,7 @@ static int video_mux_probe(struct platform_device *pdev) ...@@ -333,7 +333,7 @@ static int video_mux_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, vmux); platform_set_drvdata(pdev, vmux);
v4l2_subdev_init(&vmux->subdev, &video_mux_subdev_ops); v4l2_subdev_init(&vmux->subdev, &video_mux_subdev_ops);
snprintf(vmux->subdev.name, sizeof(vmux->subdev.name), "%s", np->name); snprintf(vmux->subdev.name, sizeof(vmux->subdev.name), "%pOFn", np);
vmux->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; vmux->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
vmux->subdev.dev = dev; vmux->subdev.dev = dev;
......
...@@ -506,8 +506,8 @@ xvip_dma_querycap(struct file *file, void *fh, struct v4l2_capability *cap) ...@@ -506,8 +506,8 @@ xvip_dma_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
strscpy(cap->driver, "xilinx-vipp", sizeof(cap->driver)); strscpy(cap->driver, "xilinx-vipp", sizeof(cap->driver));
strscpy(cap->card, dma->video.name, sizeof(cap->card)); strscpy(cap->card, dma->video.name, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s:%u", snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%pOFn:%u",
dma->xdev->dev->of_node->name, dma->port); dma->xdev->dev->of_node, dma->port);
return 0; return 0;
} }
...@@ -693,8 +693,8 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma, ...@@ -693,8 +693,8 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
dma->video.fops = &xvip_dma_fops; dma->video.fops = &xvip_dma_fops;
dma->video.v4l2_dev = &xdev->v4l2_dev; dma->video.v4l2_dev = &xdev->v4l2_dev;
dma->video.queue = &dma->queue; dma->video.queue = &dma->queue;
snprintf(dma->video.name, sizeof(dma->video.name), "%s %s %u", snprintf(dma->video.name, sizeof(dma->video.name), "%pOFn %s %u",
xdev->dev->of_node->name, xdev->dev->of_node,
type == V4L2_BUF_TYPE_VIDEO_CAPTURE ? "output" : "input", type == V4L2_BUF_TYPE_VIDEO_CAPTURE ? "output" : "input",
port); port);
dma->video.vfl_type = VFL_TYPE_GRABBER; dma->video.vfl_type = VFL_TYPE_GRABBER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment