From ebf55f0cd70938bde982fd42ed6b857034dc00bf Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 17 Feb 2025 19:25:02 +0800 Subject: [PATCH] media: rockchip: ispp: move from strlcpy with unused retval to strscpy Signed-off-by: Tao Huang Change-Id: I14768fca655f95aaa8d82457bb16d9f621ab67af --- drivers/media/platform/rockchip/ispp/dev.c | 2 +- drivers/media/platform/rockchip/ispp/fec.c | 2 +- drivers/media/platform/rockchip/ispp/params.c | 4 ++-- drivers/media/platform/rockchip/ispp/stats.c | 4 ++-- drivers/media/platform/rockchip/ispp/stream.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/rockchip/ispp/dev.c b/drivers/media/platform/rockchip/ispp/dev.c index e4611e66d264..89bf77858a3c 100644 --- a/drivers/media/platform/rockchip/ispp/dev.c +++ b/drivers/media/platform/rockchip/ispp/dev.c @@ -294,7 +294,7 @@ static int rkispp_plat_probe(struct platform_device *pdev) ispp_dev->media_dev.dev = &pdev->dev; v4l2_dev = &ispp_dev->v4l2_dev; v4l2_dev->mdev = &ispp_dev->media_dev; - strlcpy(v4l2_dev->name, ispp_dev->name, sizeof(v4l2_dev->name)); + strscpy(v4l2_dev->name, ispp_dev->name, sizeof(v4l2_dev->name)); v4l2_ctrl_handler_init(&ispp_dev->ctrl_handler, 5); v4l2_dev->ctrl_handler = &ispp_dev->ctrl_handler; diff --git a/drivers/media/platform/rockchip/ispp/fec.c b/drivers/media/platform/rockchip/ispp/fec.c index bb16d557e5e6..643322314fab 100644 --- a/drivers/media/platform/rockchip/ispp/fec.c +++ b/drivers/media/platform/rockchip/ispp/fec.c @@ -423,7 +423,7 @@ int rkispp_register_fec(struct rkispp_hw_dev *hw) fec->hw = hw; hw->is_fec_ext = true; v4l2_dev = &fec->v4l2_dev; - strlcpy(v4l2_dev->name, fec_videodev.name, sizeof(v4l2_dev->name)); + strscpy(v4l2_dev->name, fec_videodev.name, sizeof(v4l2_dev->name)); ret = v4l2_device_register(hw->dev, v4l2_dev); if (ret) return ret; diff --git a/drivers/media/platform/rockchip/ispp/params.c b/drivers/media/platform/rockchip/ispp/params.c index af5fdddb2fad..67cfe17c5eb0 100644 --- a/drivers/media/platform/rockchip/ispp/params.c +++ b/drivers/media/platform/rockchip/ispp/params.c @@ -55,8 +55,8 @@ static int rkispp_params_querycap(struct file *file, snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", DRIVER_NAME, params_vdev->dev->ispp_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; } diff --git a/drivers/media/platform/rockchip/ispp/stats.c b/drivers/media/platform/rockchip/ispp/stats.c index 94e14deb3cdc..dd1d66459d5f 100644 --- a/drivers/media/platform/rockchip/ispp/stats.c +++ b/drivers/media/platform/rockchip/ispp/stats.c @@ -143,8 +143,8 @@ static int rkispp_stats_querycap(struct file *file, snprintf(cap->driver, sizeof(cap->driver), "%s_v%d", DRIVER_NAME, stats_vdev->dev->ispp_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; } diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c index f040e4bb01aa..f610200cd7ab 100644 --- a/drivers/media/platform/rockchip/ispp/stream.c +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -1463,7 +1463,7 @@ static int rkispp_querycap(struct file *file, void *priv, struct device *dev = stream->isppdev->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->isppdev->ispp_ver >> 4); @@ -2014,7 +2014,7 @@ int rkispp_register_stream_vdevs(struct rkispp_device *dev) v4l2_err(&dev->v4l2_dev, "Invalid stream:%d\n", i); return -EINVAL; } - strlcpy(vdev->name, vdev_name, sizeof(vdev->name)); + strscpy(vdev->name, vdev_name, sizeof(vdev->name)); ret = rkispp_register_stream_video(stream); if (ret < 0) goto err;