media: use sizeof() instead of V4L2_SUBDEV_NAME_SIZE

Don't rely on a define, let the compiler use the actual
field size.

Remove all uses of the V4L2_SUBDEV_NAME_SIZE define and also
drop the define itself.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index bec7680..0ed8561 100644 (file)
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -561,7 +561,7 @@ static int msp_log_status(struct v4l2_subdev *sd)
        struct msp_state *state = to_state(sd);
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        const char *p;
-       char prefix[V4L2_SUBDEV_NAME_SIZE + 20];
+       char prefix[sizeof(sd->name) + 20];
 
        if (state->opmode == OPMODE_AUTOSELECT)
                msp_detect_stereo(client);

diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 0d879d7..b9d9058 100644 (file)
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -516,8 +516,8 @@ static int csi2rx_probe(struct platform_device *pdev)
        csi2rx->subdev.dev = &pdev->dev;
        v4l2_subdev_init(&csi2rx->subdev, &csi2rx_subdev_ops);
        v4l2_set_subdevdata(&csi2rx->subdev, &pdev->dev);
-       snprintf(csi2rx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s",
-                KBUILD_MODNAME, dev_name(&pdev->dev));
+       snprintf(csi2rx->subdev.name, sizeof(csi2rx->subdev.name),
+                "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev));
 
        /* Create our media pads */
        csi2rx->subdev.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;

diff --git a/drivers/media/platform/cadence/cdns-csi2tx.c b/drivers/media/platform/cadence/cdns-csi2tx.c
index cbbb775..c115742 100644 (file)
--- a/drivers/media/platform/cadence/cdns-csi2tx.c
+++ b/drivers/media/platform/cadence/cdns-csi2tx.c
@@ -592,8 +592,8 @@ static int csi2tx_probe(struct platform_device *pdev)
        csi2tx->subdev.owner = THIS_MODULE;
        csi2tx->subdev.dev = &pdev->dev;
        csi2tx->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-       snprintf(csi2tx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s",
-                KBUILD_MODNAME, dev_name(&pdev->dev));
+       snprintf(csi2tx->subdev.name, sizeof(csi2tx->subdev.name),
+                "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev));
 
        ret = csi2tx_check_lanes(csi2tx);
        if (ret)

diff --git a/drivers/media/platform/renesas/rcar-isp.c b/drivers/media/platform/renesas/rcar-isp.c
index 7360cf3..19a005d 100644 (file)
--- a/drivers/media/platform/renesas/rcar-isp.c
+++ b/drivers/media/platform/renesas/rcar-isp.c
@@ -467,7 +467,7 @@ static int risp_probe(struct platform_device *pdev)
        isp->subdev.dev = &pdev->dev;
        v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops);
        v4l2_set_subdevdata(&isp->subdev, &pdev->dev);
-       snprintf(isp->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s %s",
+       snprintf(isp->subdev.name, sizeof(isp->subdev.name), "%s %s",
                 KBUILD_MODNAME, dev_name(&pdev->dev));
        isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
 

diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
index f6326df..66fe553 100644 (file)
--- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
@@ -1889,7 +1889,7 @@ static int rcsi2_probe(struct platform_device *pdev)
        priv->subdev.dev = &pdev->dev;
        v4l2_subdev_init(&priv->subdev, &rcar_csi2_subdev_ops);
        v4l2_set_subdevdata(&priv->subdev, &pdev->dev);
-       snprintf(priv->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s %s",
+       snprintf(priv->subdev.name, sizeof(priv->subdev.name), "%s %s",
                 KBUILD_MODNAME, dev_name(&pdev->dev));
        priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
 

diff --git a/drivers/media/platform/ti/omap3isp/ispstat.c b/drivers/media/platform/ti/omap3isp/ispstat.c
index 68cf68d..359a846 100644 (file)
--- a/drivers/media/platform/ti/omap3isp/ispstat.c
+++ b/drivers/media/platform/ti/omap3isp/ispstat.c
@@ -1039,7 +1039,7 @@ static int isp_stat_init_entities(struct ispstat *stat, const char *name,
        struct media_entity *me = &subdev->entity;
 
        v4l2_subdev_init(subdev, sd_ops);
-       snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name);
+       snprintf(subdev->name, sizeof(subdev->name), "OMAP3 ISP %s", name);
        subdev->grp_id = BIT(16);       /* group ID for isp subdevs */
        subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE;
        v4l2_set_subdevdata(subdev, stat);

diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index e796579..9aa7286 100644 (file)
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -607,10 +607,10 @@ static int tegra_csi_channel_init(struct tegra_csi_channel *chan)
        v4l2_subdev_init(subdev, &tegra_csi_ops);
        subdev->dev = csi->dev;
        if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG))
-               snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s-%d", "tpg",
+               snprintf(subdev->name, sizeof(subdev->name), "%s-%d", "tpg",
                         chan->csi_port_nums[0]);
        else
-               snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s",
+               snprintf(subdev->name, sizeof(subdev->name), "%s",
                         kbasename(chan->of_node->full_name));
 
        v4l2_set_subdevdata(subdev, chan);

diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c
index 191ecd1..e95cc7b 100644 (file)
--- a/drivers/staging/media/tegra-video/vip.c
+++ b/drivers/staging/media/tegra-video/vip.c
@@ -163,7 +163,7 @@ static int tegra_vip_channel_init(struct tegra_vip *vip)
        subdev = &vip->chan.subdev;
        v4l2_subdev_init(subdev, &tegra_vip_ops);
        subdev->dev = vip->dev;
-       snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s",
+       snprintf(subdev->name, sizeof(subdev->name), "%s",
                 kbasename(vip->chan.of_node->full_name));
 
        v4l2_set_subdevdata(subdev, &vip->chan);

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5711354..c1f90c1 100644 (file)
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -951,8 +951,6 @@ struct v4l2_subdev_internal_ops {
        void (*release)(struct v4l2_subdev *sd);
 };
 
-#define V4L2_SUBDEV_NAME_SIZE 52
-
 /* Set this flag if this subdev is a i2c device. */
 #define V4L2_SUBDEV_FL_IS_I2C                  (1U << 0)
 /* Set this flag if this subdev is a spi device. */
@@ -1062,7 +1060,7 @@ struct v4l2_subdev {
        const struct v4l2_subdev_ops *ops;
        const struct v4l2_subdev_internal_ops *internal_ops;
        struct v4l2_ctrl_handler *ctrl_handler;
-       char name[V4L2_SUBDEV_NAME_SIZE];
+       char name[52];
        u32 grp_id;
        void *dev_priv;
        void *host_priv;