tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Hans Verkuil 8cdd708f d9d432af

+12 -14
+1 -1
drivers/media/i2c/msp3400-driver.c
··· 561 561 struct msp_state *state = to_state(sd); 562 562 struct i2c_client *client = v4l2_get_subdevdata(sd); 563 563 const char *p; 564 - char prefix[V4L2_SUBDEV_NAME_SIZE + 20]; 564 + char prefix[sizeof(sd->name) + 20]; 565 565 566 566 if (state->opmode == OPMODE_AUTOSELECT) 567 567 msp_detect_stereo(client);
+2 -2
drivers/media/platform/cadence/cdns-csi2rx.c
··· 516 516 csi2rx->subdev.dev = &pdev->dev; 517 517 v4l2_subdev_init(&csi2rx->subdev, &csi2rx_subdev_ops); 518 518 v4l2_set_subdevdata(&csi2rx->subdev, &pdev->dev); 519 - snprintf(csi2rx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s", 520 - KBUILD_MODNAME, dev_name(&pdev->dev)); 519 + snprintf(csi2rx->subdev.name, sizeof(csi2rx->subdev.name), 520 + "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev)); 521 521 522 522 /* Create our media pads */ 523 523 csi2rx->subdev.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
+2 -2
drivers/media/platform/cadence/cdns-csi2tx.c
··· 592 592 csi2tx->subdev.owner = THIS_MODULE; 593 593 csi2tx->subdev.dev = &pdev->dev; 594 594 csi2tx->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; 595 - snprintf(csi2tx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s", 596 - KBUILD_MODNAME, dev_name(&pdev->dev)); 595 + snprintf(csi2tx->subdev.name, sizeof(csi2tx->subdev.name), 596 + "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev)); 597 597 598 598 ret = csi2tx_check_lanes(csi2tx); 599 599 if (ret)
+1 -1
drivers/media/platform/renesas/rcar-isp.c
··· 467 467 isp->subdev.dev = &pdev->dev; 468 468 v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops); 469 469 v4l2_set_subdevdata(&isp->subdev, &pdev->dev); 470 - snprintf(isp->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s %s", 470 + snprintf(isp->subdev.name, sizeof(isp->subdev.name), "%s %s", 471 471 KBUILD_MODNAME, dev_name(&pdev->dev)); 472 472 isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE; 473 473
+1 -1
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
··· 1889 1889 priv->subdev.dev = &pdev->dev; 1890 1890 v4l2_subdev_init(&priv->subdev, &rcar_csi2_subdev_ops); 1891 1891 v4l2_set_subdevdata(&priv->subdev, &pdev->dev); 1892 - snprintf(priv->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s %s", 1892 + snprintf(priv->subdev.name, sizeof(priv->subdev.name), "%s %s", 1893 1893 KBUILD_MODNAME, dev_name(&pdev->dev)); 1894 1894 priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE; 1895 1895
+1 -1
drivers/media/platform/ti/omap3isp/ispstat.c
··· 1039 1039 struct media_entity *me = &subdev->entity; 1040 1040 1041 1041 v4l2_subdev_init(subdev, sd_ops); 1042 - snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name); 1042 + snprintf(subdev->name, sizeof(subdev->name), "OMAP3 ISP %s", name); 1043 1043 subdev->grp_id = BIT(16); /* group ID for isp subdevs */ 1044 1044 subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE; 1045 1045 v4l2_set_subdevdata(subdev, stat);
+2 -2
drivers/staging/media/tegra-video/csi.c
··· 607 607 v4l2_subdev_init(subdev, &tegra_csi_ops); 608 608 subdev->dev = csi->dev; 609 609 if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) 610 - snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s-%d", "tpg", 610 + snprintf(subdev->name, sizeof(subdev->name), "%s-%d", "tpg", 611 611 chan->csi_port_nums[0]); 612 612 else 613 - snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s", 613 + snprintf(subdev->name, sizeof(subdev->name), "%s", 614 614 kbasename(chan->of_node->full_name)); 615 615 616 616 v4l2_set_subdevdata(subdev, chan);
+1 -1
drivers/staging/media/tegra-video/vip.c
··· 163 163 subdev = &vip->chan.subdev; 164 164 v4l2_subdev_init(subdev, &tegra_vip_ops); 165 165 subdev->dev = vip->dev; 166 - snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s", 166 + snprintf(subdev->name, sizeof(subdev->name), "%s", 167 167 kbasename(vip->chan.of_node->full_name)); 168 168 169 169 v4l2_set_subdevdata(subdev, &vip->chan);
+1 -3
include/media/v4l2-subdev.h
··· 951 951 void (*release)(struct v4l2_subdev *sd); 952 952 }; 953 953 954 - #define V4L2_SUBDEV_NAME_SIZE 52 955 - 956 954 /* Set this flag if this subdev is a i2c device. */ 957 955 #define V4L2_SUBDEV_FL_IS_I2C (1U << 0) 958 956 /* Set this flag if this subdev is a spi device. */ ··· 1060 1062 const struct v4l2_subdev_ops *ops; 1061 1063 const struct v4l2_subdev_internal_ops *internal_ops; 1062 1064 struct v4l2_ctrl_handler *ctrl_handler; 1063 - char name[V4L2_SUBDEV_NAME_SIZE]; 1065 + char name[52]; 1064 1066 u32 grp_id; 1065 1067 void *dev_priv; 1066 1068 void *host_priv;