From fc337bb53e09234e2d5220cdfd8a3e36b2a4246e Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 17 Feb 2025 19:22:22 +0800 Subject: [PATCH] media: rockchip: isp: move from strlcpy with unused retval to strscpy Signed-off-by: Tao Huang Change-Id: Id809b2ccfec8be39ffa63edcecf86eea7302b105 --- drivers/media/platform/rockchip/isp/capture.c | 4 ++-- drivers/media/platform/rockchip/isp/capture_v1x.c | 4 ++-- drivers/media/platform/rockchip/isp/capture_v20.c | 12 ++++++------ drivers/media/platform/rockchip/isp/dev.c | 2 +- drivers/media/platform/rockchip/isp/dmarx.c | 10 +++++----- drivers/media/platform/rockchip/isp/isp_mipi_luma.c | 6 +++--- drivers/media/platform/rockchip/isp/isp_params.c | 6 +++--- drivers/media/platform/rockchip/isp/isp_stats.c | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c index dd69891d0df6..a4019fa5711b 100644 --- a/drivers/media/platform/rockchip/isp/capture.c +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -1060,7 +1060,7 @@ static int rkisp_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; } @@ -1722,7 +1722,7 @@ static int rkisp_querycap(struct file *file, void *priv, struct device *dev = stream->ispdev->dev; struct video_device *vdev = video_devdata(file); - strlcpy(cap->card, vdev->name, sizeof(cap->card)); + strscpy(cap->card, vdev->name, sizeof(cap->card)); snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", dev->driver->name, stream->ispdev->isp_ver >> 4); diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c index 45d1881548af..fa3f5664de7e 100644 --- a/drivers/media/platform/rockchip/isp/capture_v1x.c +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -1163,7 +1163,7 @@ static int rkisp_stream_init(struct rkisp_device *dev, u32 id) stream->linked = true; switch (id) { case RKISP_STREAM_SP: - strlcpy(vdev->name, SP_VDEV_NAME, + strscpy(vdev->name, SP_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp_sp_streams_ops; stream->config = &rkisp_sp_stream_config; @@ -1171,7 +1171,7 @@ static int rkisp_stream_init(struct rkisp_device *dev, u32 id) stream->config->fmt_size = ARRAY_SIZE(sp_fmts); break; default: - strlcpy(vdev->name, MP_VDEV_NAME, + strscpy(vdev->name, MP_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp_mp_streams_ops; stream->config = &rkisp_mp_stream_config; diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c index 19a27ec49745..7147379a4517 100644 --- a/drivers/media/platform/rockchip/isp/capture_v20.c +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -2002,7 +2002,7 @@ static int rkisp_stream_init(struct rkisp_device *dev, u32 id) switch (id) { case RKISP_STREAM_SP: - strlcpy(vdev->name, SP_VDEV_NAME, + strscpy(vdev->name, SP_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp_sp_streams_ops; stream->config = &rkisp_sp_stream_config; @@ -2010,31 +2010,31 @@ static int rkisp_stream_init(struct rkisp_device *dev, u32 id) stream->config->fmt_size = ARRAY_SIZE(sp_fmts); break; case RKISP_STREAM_DMATX0: - strlcpy(vdev->name, DMATX0_VDEV_NAME, + strscpy(vdev->name, DMATX0_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmatx0_streams_ops; stream->config = &rkisp2_dmatx0_stream_config; break; case RKISP_STREAM_DMATX1: - strlcpy(vdev->name, DMATX1_VDEV_NAME, + strscpy(vdev->name, DMATX1_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmatx1_streams_ops; stream->config = &rkisp2_dmatx1_stream_config; break; case RKISP_STREAM_DMATX2: - strlcpy(vdev->name, DMATX2_VDEV_NAME, + strscpy(vdev->name, DMATX2_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmatx2_streams_ops; stream->config = &rkisp2_dmatx2_stream_config; break; case RKISP_STREAM_DMATX3: - strlcpy(vdev->name, DMATX3_VDEV_NAME, + strscpy(vdev->name, DMATX3_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmatx3_streams_ops; stream->config = &rkisp2_dmatx3_stream_config; break; default: - strlcpy(vdev->name, MP_VDEV_NAME, + strscpy(vdev->name, MP_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp_mp_streams_ops; stream->config = &rkisp_mp_stream_config; diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c index f614f4129b08..a620198bd693 100644 --- a/drivers/media/platform/rockchip/isp/dev.c +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -950,7 +950,7 @@ static int rkisp_plat_probe(struct platform_device *pdev) v4l2_dev = &isp_dev->v4l2_dev; v4l2_dev->mdev = &isp_dev->media_dev; - strlcpy(v4l2_dev->name, isp_dev->name, sizeof(v4l2_dev->name)); + strscpy(v4l2_dev->name, isp_dev->name, sizeof(v4l2_dev->name)); v4l2_ctrl_handler_init(&isp_dev->ctrl_handler, 5); v4l2_dev->ctrl_handler = &isp_dev->ctrl_handler; diff --git a/drivers/media/platform/rockchip/isp/dmarx.c b/drivers/media/platform/rockchip/isp/dmarx.c index df42ee814161..1d82d0717fec 100644 --- a/drivers/media/platform/rockchip/isp/dmarx.c +++ b/drivers/media/platform/rockchip/isp/dmarx.c @@ -979,7 +979,7 @@ static int rkisp_querycap(struct file *file, void *priv, struct device *dev = stream->ispdev->dev; struct video_device *vdev = video_devdata(file); - strlcpy(cap->card, vdev->name, sizeof(cap->card)); + strscpy(cap->card, vdev->name, sizeof(cap->card)); snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", dev->driver->name, stream->ispdev->isp_ver >> 4); @@ -1158,25 +1158,25 @@ static int dmarx_init(struct rkisp_device *dev, u32 id) switch (id) { case RKISP_STREAM_DMARX: - strlcpy(vdev->name, DMA_VDEV_NAME, + strscpy(vdev->name, DMA_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp_dmarx_streams_ops; stream->config = &rkisp_dmarx_stream_config; break; case RKISP_STREAM_RAWRD0: - strlcpy(vdev->name, DMARX0_VDEV_NAME, + strscpy(vdev->name, DMARX0_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmarx_streams_ops; stream->config = &rkisp2_dmarx0_stream_config; break; case RKISP_STREAM_RAWRD1: - strlcpy(vdev->name, DMARX1_VDEV_NAME, + strscpy(vdev->name, DMARX1_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmarx_streams_ops; stream->config = &rkisp2_dmarx1_stream_config; break; case RKISP_STREAM_RAWRD2: - strlcpy(vdev->name, DMARX2_VDEV_NAME, + strscpy(vdev->name, DMARX2_VDEV_NAME, sizeof(vdev->name)); stream->ops = &rkisp2_dmarx_streams_ops; stream->config = &rkisp2_dmarx2_stream_config; diff --git a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c index 1e2039e01dce..52c86ff6e331 100644 --- a/drivers/media/platform/rockchip/isp/isp_mipi_luma.c +++ b/drivers/media/platform/rockchip/isp/isp_mipi_luma.c @@ -53,8 +53,8 @@ static int rkisp_luma_querycap(struct file *file, snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", DRIVER_NAME, luma_vdev->dev->isp_ver >> 4); - strlcpy(cap->card, vdev->name, sizeof(cap->card)); - strlcpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); + strscpy(cap->card, vdev->name, sizeof(cap->card)); + strscpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); return 0; } @@ -453,7 +453,7 @@ int rkisp_register_luma_vdev(struct rkisp_luma_vdev *luma_vdev, spin_lock_init(&luma_vdev->irq_lock); spin_lock_init(&luma_vdev->rd_lock); - strlcpy(vdev->name, "rkisp-mipi-luma", sizeof(vdev->name)); + strscpy(vdev->name, "rkisp-mipi-luma", sizeof(vdev->name)); vdev->ioctl_ops = &rkisp_luma_ioctl; vdev->fops = &rkisp_luma_fops; diff --git a/drivers/media/platform/rockchip/isp/isp_params.c b/drivers/media/platform/rockchip/isp/isp_params.c index e607df692501..26282466b640 100644 --- a/drivers/media/platform/rockchip/isp/isp_params.c +++ b/drivers/media/platform/rockchip/isp/isp_params.c @@ -61,8 +61,8 @@ static int rkisp_params_querycap(struct file *file, snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", DRIVER_NAME, params_vdev->dev->isp_ver >> 4); - strlcpy(cap->card, vdev->name, sizeof(cap->card)); - strlcpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); + strscpy(cap->card, vdev->name, sizeof(cap->card)); + strscpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); cap->version = RKISP_DRIVER_VERSION; return 0; } @@ -594,7 +594,7 @@ int rkisp_register_params_vdev(struct rkisp_isp_params_vdev *params_vdev, params_vdev->is_subs_evt = false; spin_lock_init(¶ms_vdev->config_lock); - strlcpy(vdev->name, PARAMS_NAME, sizeof(vdev->name)); + strscpy(vdev->name, PARAMS_NAME, sizeof(vdev->name)); vdev->ioctl_ops = &rkisp_params_ioctl; vdev->fops = &rkisp_params_fops; diff --git a/drivers/media/platform/rockchip/isp/isp_stats.c b/drivers/media/platform/rockchip/isp/isp_stats.c index f5a316326fce..bffdd992afb5 100644 --- a/drivers/media/platform/rockchip/isp/isp_stats.c +++ b/drivers/media/platform/rockchip/isp/isp_stats.c @@ -61,8 +61,8 @@ static int rkisp_stats_querycap(struct file *file, snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", DRIVER_NAME, stats_vdev->dev->isp_ver >> 4); - strlcpy(cap->card, vdev->name, sizeof(cap->card)); - strlcpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); + strscpy(cap->card, vdev->name, sizeof(cap->card)); + strscpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); cap->version = RKISP_DRIVER_VERSION; return 0; } @@ -410,7 +410,7 @@ int rkisp_register_stats_vdev(struct rkisp_isp_stats_vdev *stats_vdev, spin_lock_init(&stats_vdev->irq_lock); spin_lock_init(&stats_vdev->rd_lock); - strlcpy(vdev->name, STATS_NAME, sizeof(vdev->name)); + strscpy(vdev->name, STATS_NAME, sizeof(vdev->name)); vdev->ioctl_ops = &rkisp_stats_ioctl; vdev->fops = &rkisp_stats_fops;