From d2ae61cf23105e23b7d69f447f8863ab136811db Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 17 Feb 2025 19:21:41 +0800 Subject: [PATCH] media: rockchip: cif: move from strlcpy with unused retval to strscpy Signed-off-by: Tao Huang Change-Id: Ia6d2071d823b66cf3759a862b963374ee3d81161 --- drivers/media/platform/rockchip/cif/capture.c | 8 ++++---- drivers/media/platform/rockchip/cif/cif-luma.c | 6 +++--- drivers/media/platform/rockchip/cif/dev.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 3c44b8af99ef..d6ec7c23e31b 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -8469,7 +8469,7 @@ static int rkcif_enum_input(struct file *file, void *priv, return -EINVAL; input->type = V4L2_INPUT_TYPE_CAMERA; - strlcpy(input->name, "Camera", sizeof(input->name)); + strscpy(input->name, "Camera", sizeof(input->name)); return 0; } @@ -8661,8 +8661,8 @@ static int rkcif_querycap(struct file *file, void *priv, struct rkcif_stream *stream = video_drvdata(file); struct device *dev = stream->cifdev->dev; - strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - strlcpy(cap->card, dev->driver->name, sizeof(cap->card)); + strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); + strscpy(cap->card, dev->driver->name, sizeof(cap->card)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev_name(dev)); @@ -9684,7 +9684,7 @@ static int rkcif_register_stream_vdev(struct rkcif_stream *stream, } } - strlcpy(vdev->name, vdev_name, sizeof(vdev->name)); + strscpy(vdev->name, vdev_name, sizeof(vdev->name)); node = vdev_to_node(vdev); mutex_init(&node->vlock); diff --git a/drivers/media/platform/rockchip/cif/cif-luma.c b/drivers/media/platform/rockchip/cif/cif-luma.c index 5a3c228cf76c..4859fbeb9189 100644 --- a/drivers/media/platform/rockchip/cif/cif-luma.c +++ b/drivers/media/platform/rockchip/cif/cif-luma.c @@ -58,8 +58,8 @@ static int rkcif_luma_querycap(struct file *file, struct rkcif_luma_vdev *luma_vdev = video_get_drvdata(vdev); struct device *dev = luma_vdev->cifdev->dev; - strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - strlcpy(cap->card, dev->driver->name, sizeof(cap->card)); + strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); + strscpy(cap->card, dev->driver->name, sizeof(cap->card)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev_name(dev)); @@ -454,7 +454,7 @@ int rkcif_register_luma_vdev(struct rkcif_luma_vdev *luma_vdev, spin_lock_init(&luma_vdev->irq_lock); spin_lock_init(&luma_vdev->rd_lock); - strlcpy(vdev->name, "rkcif-mipi-luma", sizeof(vdev->name)); + strscpy(vdev->name, "rkcif-mipi-luma", sizeof(vdev->name)); mutex_init(&node->vlock); vdev->ioctl_ops = &rkcif_luma_ioctl; diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c index 319d7527cc17..275ac198cf76 100644 --- a/drivers/media/platform/rockchip/cif/dev.c +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -2930,7 +2930,7 @@ int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int if (cif_dev->chip_id == CHIP_RV1106_CIF) cif_dev->is_use_dummybuf = false; - strlcpy(cif_dev->media_dev.model, dev_name(dev), + strscpy(cif_dev->media_dev.model, dev_name(dev), sizeof(cif_dev->media_dev.model)); cif_dev->csi_host_idx = of_alias_get_id(node, "rkcif_mipi_lvds"); if (cif_dev->csi_host_idx < 0 || cif_dev->csi_host_idx > 5) @@ -2951,7 +2951,7 @@ int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int cif_dev->media_dev.dev = dev; v4l2_dev = &cif_dev->v4l2_dev; v4l2_dev->mdev = &cif_dev->media_dev; - strlcpy(v4l2_dev->name, dev_name(dev), sizeof(v4l2_dev->name)); + strscpy(v4l2_dev->name, dev_name(dev), sizeof(v4l2_dev->name)); ret = v4l2_device_register(cif_dev->dev, &cif_dev->v4l2_dev); if (ret < 0)