iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: use sizeof() instead of V4L2_SUBDEV_NAME_SIZE

Browse Source 
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>
This commit is contained in:
Hans Verkuil 2023-09-23 17:20:57 +02:00
parent d9d432af14
commit 8cdd708f11
9 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/i2c/msp3400-driver.c
View File

@ -561,7 +561,7 @@ static int msp_log_status(struct v4l2_subdev *sd)
struct msp_state *state = to_state(sd); struct msp_state *state = to_state(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd); struct i2c_client *client = v4l2_get_subdevdata(sd);
const char *p; const char *p;
char prefix[V4L2_SUBDEV_NAME_SIZE + 20]; char prefix[sizeof(sd->name) + 20];
if (state->opmode == OPMODE_AUTOSELECT) if (state->opmode == OPMODE_AUTOSELECT)
msp_detect_stereo(client); msp_detect_stereo(client);

4
drivers/media/platform/cadence/cdns-csi2rx.c
View File

@ -516,8 +516,8 @@ static int csi2rx_probe(struct platform_device *pdev)
csi2rx->subdev.dev = &pdev->dev; csi2rx->subdev.dev = &pdev->dev;
v4l2_subdev_init(&csi2rx->subdev, &csi2rx_subdev_ops); v4l2_subdev_init(&csi2rx->subdev, &csi2rx_subdev_ops);
v4l2_set_subdevdata(&csi2rx->subdev, &pdev->dev); v4l2_set_subdevdata(&csi2rx->subdev, &pdev->dev);
snprintf(csi2rx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s", snprintf(csi2rx->subdev.name, sizeof(csi2rx->subdev.name),
KBUILD_MODNAME, dev_name(&pdev->dev)); "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev));
/* Create our media pads */ /* Create our media pads */
csi2rx->subdev.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE; csi2rx->subdev.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;

4
drivers/media/platform/cadence/cdns-csi2tx.c
View File

@ -592,8 +592,8 @@ static int csi2tx_probe(struct platform_device *pdev)
csi2tx->subdev.owner = THIS_MODULE; csi2tx->subdev.owner = THIS_MODULE;
csi2tx->subdev.dev = &pdev->dev; csi2tx->subdev.dev = &pdev->dev;
csi2tx->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; csi2tx->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
snprintf(csi2tx->subdev.name, V4L2_SUBDEV_NAME_SIZE, "%s.%s", snprintf(csi2tx->subdev.name, sizeof(csi2tx->subdev.name),
KBUILD_MODNAME, dev_name(&pdev->dev)); "%s.%s", KBUILD_MODNAME, dev_name(&pdev->dev));
ret = csi2tx_check_lanes(csi2tx); ret = csi2tx_check_lanes(csi2tx);
if (ret) if (ret)

2
drivers/media/platform/renesas/rcar-isp.c
View File

@ -467,7 +467,7 @@ static int risp_probe(struct platform_device *pdev)
isp->subdev.dev = &pdev->dev; isp->subdev.dev = &pdev->dev;
v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops); v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops);
v4l2_set_subdevdata(&isp->subdev, &pdev->dev); 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)); KBUILD_MODNAME, dev_name(&pdev->dev));
isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE; isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

2
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
View File

@ -1889,7 +1889,7 @@ static int rcsi2_probe(struct platform_device *pdev)
priv->subdev.dev = &pdev->dev; priv->subdev.dev = &pdev->dev;
v4l2_subdev_init(&priv->subdev, &rcar_csi2_subdev_ops); v4l2_subdev_init(&priv->subdev, &rcar_csi2_subdev_ops);
v4l2_set_subdevdata(&priv->subdev, &pdev->dev); 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)); KBUILD_MODNAME, dev_name(&pdev->dev));
priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE; priv->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

2
drivers/media/platform/ti/omap3isp/ispstat.c
View File

@ -1039,7 +1039,7 @@ static int isp_stat_init_entities(struct ispstat *stat, const char *name,
struct media_entity *me = &subdev->entity; struct media_entity *me = &subdev->entity;
v4l2_subdev_init(subdev, sd_ops); 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->grp_id = BIT(16); /* group ID for isp subdevs */
subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE; subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE;
v4l2_set_subdevdata(subdev, stat); v4l2_set_subdevdata(subdev, stat);

4
drivers/staging/media/tegra-video/csi.c
View File

@ -607,10 +607,10 @@ static int tegra_csi_channel_init(struct tegra_csi_channel *chan)
v4l2_subdev_init(subdev, &tegra_csi_ops); v4l2_subdev_init(subdev, &tegra_csi_ops);
subdev->dev = csi->dev; subdev->dev = csi->dev;
if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) 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]); chan->csi_port_nums[0]);
else else
snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "%s", snprintf(subdev->name, sizeof(subdev->name), "%s",
kbasename(chan->of_node->full_name)); kbasename(chan->of_node->full_name));
v4l2_set_subdevdata(subdev, chan); v4l2_set_subdevdata(subdev, chan);

2
drivers/staging/media/tegra-video/vip.c
View File

@ -163,7 +163,7 @@ static int tegra_vip_channel_init(struct tegra_vip *vip)
subdev = &vip->chan.subdev; subdev = &vip->chan.subdev;
v4l2_subdev_init(subdev, &tegra_vip_ops); v4l2_subdev_init(subdev, &tegra_vip_ops);
subdev->dev = vip->dev; 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)); kbasename(vip->chan.of_node->full_name));
v4l2_set_subdevdata(subdev, &vip->chan); v4l2_set_subdevdata(subdev, &vip->chan);

4
include/media/v4l2-subdev.h
View File

@ -951,8 +951,6 @@ struct v4l2_subdev_internal_ops {
void (*release)(struct v4l2_subdev *sd); void (*release)(struct v4l2_subdev *sd);
}; };
#define V4L2_SUBDEV_NAME_SIZE 52
/* Set this flag if this subdev is a i2c device. */ /* Set this flag if this subdev is a i2c device. */
#define V4L2_SUBDEV_FL_IS_I2C (1U << 0) #define V4L2_SUBDEV_FL_IS_I2C (1U << 0)
/* Set this flag if this subdev is a spi device. */ /* 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_ops *ops;
const struct v4l2_subdev_internal_ops *internal_ops; const struct v4l2_subdev_internal_ops *internal_ops;
struct v4l2_ctrl_handler *ctrl_handler; struct v4l2_ctrl_handler *ctrl_handler;
char name[V4L2_SUBDEV_NAME_SIZE]; char name[52];
u32 grp_id; u32 grp_id;
void *dev_priv; void *dev_priv;
void *host_priv; void *host_priv;