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: Rob Herring <robh@kernel.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Родитель
04b72322e8
Коммит
f764e6d680
|
@ -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);
|
||||
if (ret) {
|
||||
dev_err(decoder->sd.dev,
|
||||
"missing type property in node %s\n",
|
||||
child->name);
|
||||
"missing type property in node %pOFn\n",
|
||||
child);
|
||||
goto err_connector;
|
||||
}
|
||||
|
||||
|
@ -1439,8 +1439,8 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
|
|||
ret = of_property_read_string(child, "label", &name);
|
||||
if (ret < 0) {
|
||||
dev_err(decoder->sd.dev,
|
||||
"missing label property in node %s\n",
|
||||
child->name);
|
||||
"missing label property in node %pOFn\n",
|
||||
child);
|
||||
goto err_connector;
|
||||
}
|
||||
|
||||
|
|
|
@ -1585,8 +1585,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
|
|||
goto done;
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "Remote device %s, %pOF found\n",
|
||||
rem->name, rem);
|
||||
dev_dbg(&pdev->dev, "Remote device %pOF found\n", rem);
|
||||
sdinfo->name = rem->full_name;
|
||||
|
||||
pdata->asd[i] = devm_kzalloc(&pdev->dev,
|
||||
|
|
|
@ -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);
|
||||
|
||||
if (endpoint->bus_type != V4L2_MBUS_CSI2) {
|
||||
ctx_err(ctx, "Port:%d sub-device %s is not a CSI2 device\n",
|
||||
inst, sensor_node->name);
|
||||
ctx_err(ctx, "Port:%d sub-device %pOFn is not a CSI2 device\n",
|
||||
inst, sensor_node);
|
||||
goto cleanup_exit;
|
||||
}
|
||||
|
||||
|
@ -1732,8 +1732,8 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
|
|||
endpoint->bus.mipi_csi2.data_lanes[lane]);
|
||||
ctx_dbg(3, ctx, "\t>\n");
|
||||
|
||||
ctx_dbg(1, ctx, "Port: %d found sub-device %s\n",
|
||||
inst, sensor_node->name);
|
||||
ctx_dbg(1, ctx, "Port: %d found sub-device %pOFn\n",
|
||||
inst, sensor_node);
|
||||
|
||||
ctx->asd_list[0] = asd;
|
||||
ctx->notifier.subdevs = ctx->asd_list;
|
||||
|
|
|
@ -333,7 +333,7 @@ static int video_mux_probe(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, vmux);
|
||||
|
||||
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.dev = dev;
|
||||
|
||||
|
|
|
@ -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->card, dma->video.name, sizeof(cap->card));
|
||||
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s:%u",
|
||||
dma->xdev->dev->of_node->name, dma->port);
|
||||
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%pOFn:%u",
|
||||
dma->xdev->dev->of_node, dma->port);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -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.v4l2_dev = &xdev->v4l2_dev;
|
||||
dma->video.queue = &dma->queue;
|
||||
snprintf(dma->video.name, sizeof(dma->video.name), "%s %s %u",
|
||||
xdev->dev->of_node->name,
|
||||
snprintf(dma->video.name, sizeof(dma->video.name), "%pOFn %s %u",
|
||||
xdev->dev->of_node,
|
||||
type == V4L2_BUF_TYPE_VIDEO_CAPTURE ? "output" : "input",
|
||||
port);
|
||||
dma->video.vfl_type = VFL_TYPE_GRABBER;
|
||||
|
|
Загрузка…
Ссылка в новой задаче