Hi Laurent,
On Thu, Jan 14, 2021 at 05:07:19AM +0200, Laurent Pinchart wrote:
> The functions that add an async subdev to an async subdev notifier take
> as an argument the size of the container structure they need to
> allocate. This is error prone, as passing an invalid size will not be
> caught by the compiler. Wrap those functions in macros that take a
> container type instead of a size, and cast the returned pointer to the
> desired type. The compiler will catch mistakes if the incorrect type is
> passed to the macro, as the assignment types won't match.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
>
> This patch is based on top of Ezequiel's "[PATCH 00/13] V4L2 Async
> notifier API cleanup" series. It makes errors such as the one fixed by
> "[PATCH] media: ti-vpe: cal: fix write to unallocated memory" impossible
> to occur in the first place.
>
> drivers/media/i2c/max9286.c | 2 +-
> drivers/media/i2c/st-mipid02.c | 2 +-
> drivers/media/pci/intel/ipu3/ipu3-cio2.c | 10 ++---
> drivers/media/platform/am437x/am437x-vpfe.c | 2 +-
> drivers/media/platform/atmel/atmel-isi.c | 2 +-
> .../media/platform/atmel/atmel-sama5d2-isc.c | 2 +-
> drivers/media/platform/cadence/cdns-csi2rx.c | 3 +-
> drivers/media/platform/davinci/vpif_capture.c | 2 +-
> drivers/media/platform/exynos4-is/media-dev.c | 3 +-
> .../media/platform/marvell-ccic/cafe-driver.c | 2 +-
> .../media/platform/marvell-ccic/mmp-driver.c | 4 +-
> drivers/media/platform/omap3isp/isp.c | 16 +++-----
> drivers/media/platform/pxa_camera.c | 4 +-
> drivers/media/platform/qcom/camss/camss.c | 11 ++----
> drivers/media/platform/rcar-vin/rcar-core.c | 5 ++-
> drivers/media/platform/rcar-vin/rcar-csi2.c | 2 +-
> drivers/media/platform/rcar_drif.c | 2 +-
> drivers/media/platform/renesas-ceu.c | 20 ++++------
> .../platform/rockchip/rkisp1/rkisp1-dev.c | 10 ++---
> drivers/media/platform/stm32/stm32-dcmi.c | 3 +-
> .../platform/sunxi/sun4i-csi/sun4i_csi.c | 4 +-
> drivers/media/platform/ti-vpe/cal.c | 12 +++---
> drivers/media/platform/video-mux.c | 2 +-
> drivers/media/platform/xilinx/xilinx-vipp.c | 10 ++---
> drivers/media/v4l2-core/v4l2-async.c | 38 +++++++++----------
> drivers/media/v4l2-core/v4l2-fwnode.c | 4 +-
> drivers/staging/media/imx/imx-media-csi.c | 2 +-
> drivers/staging/media/imx/imx-media-of.c | 2 +-
> drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +-
> drivers/staging/media/imx/imx7-media-csi.c | 2 +-
> drivers/staging/media/imx/imx7-mipi-csis.c | 2 +-
> drivers/staging/media/tegra-video/vi.c | 10 ++---
> include/media/v4l2-async.h | 36 ++++++++++++------
> 33 files changed, 116 insertions(+), 117 deletions(-)
>
> diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c
> index c82c1493e099..c31858548d34 100644
> --- a/drivers/media/i2c/max9286.c
> +++ b/drivers/media/i2c/max9286.c
> @@ -580,7 +580,7 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)
>
> asd = v4l2_async_notifier_add_fwnode_subdev(&priv->notifier,
> source->fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> if (IS_ERR(asd)) {
> dev_err(dev, "Failed to add subdev for source %u: %ld",
> i, PTR_ERR(asd));
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
> index 98bff765b02e..a9cc09653110 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -642,7 +642,7 @@ static int rvin_parallel_parse_of(struct rvin_dev *vin)
> }
>
> asd = v4l2_async_notifier_add_fwnode_subdev(&vin->notifier, fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> if (IS_ERR(asd)) {
> ret = PTR_ERR(asd);
> goto out;
> @@ -842,7 +842,8 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id)
> }
>
> asd = v4l2_async_notifier_add_fwnode_subdev(&vin->group->notifier,
> - fwnode, sizeof(*asd));
> + fwnode,
> + struct v4l2_async_subdev);
> if (IS_ERR(asd)) {
> ret = PTR_ERR(asd);
> goto out;
> diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
> index 945d2eb87233..e06cd512aba2 100644
> --- a/drivers/media/platform/rcar-vin/rcar-csi2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
> @@ -910,7 +910,7 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)
> priv->notifier.ops = &rcar_csi2_notify_ops;
>
> asd = v4l2_async_notifier_add_fwnode_subdev(&priv->notifier, fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> fwnode_handle_put(fwnode);
> if (IS_ERR(asd))
> return PTR_ERR(asd);
> diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c
> index f318cd4b8086..83bd9a412a56 100644
> --- a/drivers/media/platform/rcar_drif.c
> +++ b/drivers/media/platform/rcar_drif.c
> @@ -1231,7 +1231,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)
> }
>
> asd = v4l2_async_notifier_add_fwnode_subdev(notifier, fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> fwnode_handle_put(fwnode);
> if (IS_ERR(asd))
> return PTR_ERR(asd);
> diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
> index 18485812a21e..ae4ad255a46a 100644
> --- a/drivers/media/platform/renesas-ceu.c
> +++ b/drivers/media/platform/renesas-ceu.c
> @@ -1473,7 +1473,6 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,
> const struct ceu_platform_data *pdata)
> {
> const struct ceu_async_subdev *async_sd;
> - struct v4l2_async_subdev *asd;
> struct ceu_subdev *ceu_sd;
> unsigned int i;
> int ret;
> @@ -1489,16 +1488,15 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,
>
> /* Setup the ceu subdevice and the async subdevice. */
> async_sd = &pdata->subdevs[i];
> - asd = v4l2_async_notifier_add_i2c_subdev(&ceudev->notifier,
> + async_sd = v4l2_async_notifier_add_i2c_subdev(&ceudev->notifier,
This overwrites async_sd :/
> async_sd->i2c_adapter_id,
> async_sd->i2c_address,
> - sizeof(*ceu_sd));
> - if (IS_ERR(asd)) {
> - ret = PTR_ERR(asd);
> + struct ceu_subdev);
> + if (IS_ERR(ceu_sd)) {
> + ret = PTR_ERR(ceu_sd);
> v4l2_async_notifier_cleanup(&ceudev->notifier);
> return ret;
> }
> - ceu_sd = to_ceu_subdev(asd);
so it probably should be assigned to ceu_sd
> ceu_sd->mbus_flags = async_sd->flags;
> ceudev->subdevs[i] = ceu_sd;
> }
> @@ -1513,7 +1511,6 @@ static int ceu_parse_dt(struct ceu_device *ceudev)
> {
> struct device_node *of = ceudev->dev->of_node;
> struct device_node *ep;
> - struct v4l2_async_subdev *asd;
> struct ceu_subdev *ceu_sd;
> unsigned int i;
> int num_ep;
> @@ -1555,14 +1552,13 @@ static int ceu_parse_dt(struct ceu_device *ceudev)
> }
>
> /* Setup the ceu subdevice and the async subdevice. */
> - asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> + ceu_sd = v4l2_async_notifier_add_fwnode_remote_subdev(
> &ceudev->notifier, of_fwnode_handle(ep),
> - sizeof(*ceu_sd));
> - if (IS_ERR(asd)) {
> - ret = PTR_ERR(asd);
> + struct ceu_subdev);
> + if (IS_ERR(ceu_sd)) {
> + ret = PTR_ERR(ceu_sd);
> goto error_cleanup;
> }
> - ceu_sd = to_ceu_subdev(asd);
> ceu_sd->mbus_flags = fw_ep.bus.parallel.flags;
> ceudev->subdevs[i] = ceu_sd;
This one's correct
With the ceu fixed, the rest looks good
Reviewed-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
Thanks
j
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 235dcf0c4122..447721e78d1e 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -251,8 +251,7 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)
> struct v4l2_fwnode_endpoint vep = {
> .bus_type = V4L2_MBUS_CSI2_DPHY
> };
> - struct rkisp1_sensor_async *rk_asd = NULL;
> - struct v4l2_async_subdev *asd;
> + struct rkisp1_sensor_async *rk_asd;
> struct fwnode_handle *ep;
>
> ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(rkisp1->dev),
> @@ -265,12 +264,11 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)
> if (ret)
> goto err_parse;
>
> - asd = v4l2_async_notifier_add_fwnode_remote_subdev(ntf, ep,
> - sizeof(*rk_asd));
> - if (IS_ERR(asd))
> + rk_asd = v4l2_async_notifier_add_fwnode_remote_subdev(ntf, ep,
> + struct rkisp1_sensor_async);
> + if (IS_ERR(rk_asd))
> goto err_parse;
>
> - rk_asd = container_of(asd, struct rkisp1_sensor_async, asd);
> rk_asd->mbus_type = vep.bus_type;
> rk_asd->mbus_flags = vep.bus.mipi_csi2.flags;
> rk_asd->lanes = vep.bus.mipi_csi2.num_data_lanes;
> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
> index 142f63d07dcd..bbcc2254fa2e 100644
> --- a/drivers/media/platform/stm32/stm32-dcmi.c
> +++ b/drivers/media/platform/stm32/stm32-dcmi.c
> @@ -1820,7 +1820,8 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)
> v4l2_async_notifier_init(&dcmi->notifier);
>
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &dcmi->notifier, of_fwnode_handle(ep), sizeof(*asd));
> + &dcmi->notifier, of_fwnode_handle(ep),
> + struct v4l2_async_subdev);
>
> of_node_put(ep);
>
> diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
> index 3f94b8c966f3..8d40a7acba9c 100644
> --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
> +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
> @@ -135,8 +135,8 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)
>
> csi->bus = vep.bus.parallel;
>
> - asd = v4l2_async_notifier_add_fwnode_remote_subdev(&csi->notifier,
> - ep, sizeof(*asd));
> + asd = v4l2_async_notifier_add_fwnode_remote_subdev(&csi->notifier, ep,
> + struct v4l2_async_subdev);
> if (IS_ERR(asd)) {
> ret = PTR_ERR(asd);
> goto out;
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 293cbac905b3..9169068a23a9 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -685,23 +685,21 @@ static int cal_async_notifier_register(struct cal_dev *cal)
> for (i = 0; i < cal->data->num_csi2_phy; ++i) {
> struct cal_camerarx *phy = cal->phy[i];
> struct cal_v4l2_async_subdev *casd;
> - struct v4l2_async_subdev *asd;
> struct fwnode_handle *fwnode;
>
> if (!phy->sensor_node)
> continue;
>
> fwnode = of_fwnode_handle(phy->sensor_node);
> - asd = v4l2_async_notifier_add_fwnode_subdev(&cal->notifier,
> - fwnode,
> - sizeof(*asd));
> - if (IS_ERR(asd)) {
> + casd = v4l2_async_notifier_add_fwnode_subdev(&cal->notifier,
> + fwnode,
> + struct v4l2_async_subdev);
> + if (IS_ERR(casd)) {
> phy_err(phy, "Failed to add subdev to notifier\n");
> - ret = PTR_ERR(asd);
> + ret = PTR_ERR(casd);
> goto error;
> }
>
> - casd = to_cal_asd(asd);
> casd->phy = phy;
> }
>
> diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
> index 7b280dfca727..133122e38515 100644
> --- a/drivers/media/platform/video-mux.c
> +++ b/drivers/media/platform/video-mux.c
> @@ -371,7 +371,7 @@ static int video_mux_async_register(struct video_mux *vmux,
> continue;
>
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &vmux->notifier, ep, sizeof(*asd));
> + &vmux->notifier, ep, struct v4l2_async_subdev);
>
> fwnode_handle_put(ep);
>
> diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c
> index cc2856efea59..bf4015d852e3 100644
> --- a/drivers/media/platform/xilinx/xilinx-vipp.c
> +++ b/drivers/media/platform/xilinx/xilinx-vipp.c
> @@ -359,7 +359,7 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,
> dev_dbg(xdev->dev, "parsing node %p\n", fwnode);
>
> while (1) {
> - struct v4l2_async_subdev *asd;
> + struct xvip_graph_entity *xge;
>
> ep = fwnode_graph_get_next_endpoint(fwnode, ep);
> if (ep == NULL)
> @@ -382,12 +382,12 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,
> continue;
> }
>
> - asd = v4l2_async_notifier_add_fwnode_subdev(
> + xge = v4l2_async_notifier_add_fwnode_subdev(
> &xdev->notifier, remote,
> - sizeof(struct xvip_graph_entity));
> + struct xvip_graph_entity);
> fwnode_handle_put(remote);
> - if (IS_ERR(asd)) {
> - ret = PTR_ERR(asd);
> + if (IS_ERR(xge)) {
> + ret = PTR_ERR(xge);
> goto err_notifier_cleanup;
> }
> }
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 8cd431fbd165..35c4e8df6c9a 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -648,9 +648,9 @@ int __v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
> EXPORT_SYMBOL_GPL(__v4l2_async_notifier_add_subdev);
>
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
> - struct fwnode_handle *fwnode,
> - unsigned int asd_struct_size)
> +__v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
> + struct fwnode_handle *fwnode,
> + unsigned int asd_struct_size)
> {
> struct v4l2_async_subdev *asd;
> int ret;
> @@ -671,12 +671,12 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
>
> return asd;
> }
> -EXPORT_SYMBOL_GPL(v4l2_async_notifier_add_fwnode_subdev);
> +EXPORT_SYMBOL_GPL(__v4l2_async_notifier_add_fwnode_subdev);
>
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> - struct fwnode_handle *endpoint,
> - unsigned int asd_struct_size)
> +__v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> + struct fwnode_handle *endpoint,
> + unsigned int asd_struct_size)
> {
> struct v4l2_async_subdev *asd;
> struct fwnode_handle *remote;
> @@ -685,21 +685,21 @@ v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> if (!remote)
> return ERR_PTR(ENOTCONN);
>
> - asd = v4l2_async_notifier_add_fwnode_subdev(notif,
> - remote, asd_struct_size);
> + asd = __v4l2_async_notifier_add_fwnode_subdev(notif, remote,
> + asd_struct_size);
> /*
> - * Calling v4l2_async_notifier_add_fwnode_subdev grabs a refcount,
> + * Calling __v4l2_async_notifier_add_fwnode_subdev grabs a refcount,
> * so drop then one we got in fwnode_graph_get_remote_port_parent.
> */
> fwnode_handle_put(remote);
> return asd;
> }
> -EXPORT_SYMBOL_GPL(v4l2_async_notifier_add_fwnode_remote_subdev);
> +EXPORT_SYMBOL_GPL(__v4l2_async_notifier_add_fwnode_remote_subdev);
>
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
> - int adapter_id, unsigned short address,
> - unsigned int asd_struct_size)
> +__v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
> + int adapter_id, unsigned short address,
> + unsigned int asd_struct_size)
> {
> struct v4l2_async_subdev *asd;
> int ret;
> @@ -720,12 +720,12 @@ v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
>
> return asd;
> }
> -EXPORT_SYMBOL_GPL(v4l2_async_notifier_add_i2c_subdev);
> +EXPORT_SYMBOL_GPL(__v4l2_async_notifier_add_i2c_subdev);
>
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_devname_subdev(struct v4l2_async_notifier *notifier,
> - const char *device_name,
> - unsigned int asd_struct_size)
> +__v4l2_async_notifier_add_devname_subdev(struct v4l2_async_notifier *notifier,
> + const char *device_name,
> + unsigned int asd_struct_size)
> {
> struct v4l2_async_subdev *asd;
> int ret;
> @@ -745,7 +745,7 @@ v4l2_async_notifier_add_devname_subdev(struct v4l2_async_notifier *notifier,
>
> return asd;
> }
> -EXPORT_SYMBOL_GPL(v4l2_async_notifier_add_devname_subdev);
> +EXPORT_SYMBOL_GPL(__v4l2_async_notifier_add_devname_subdev);
>
> int v4l2_async_register_subdev(struct v4l2_subdev *sd)
> {
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index 919fde20032e..74226f8f99e7 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -955,7 +955,7 @@ static int v4l2_fwnode_reference_parse(struct device *dev,
>
> asd = v4l2_async_notifier_add_fwnode_subdev(notifier,
> args.fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> fwnode_handle_put(args.fwnode);
> if (IS_ERR(asd)) {
> /* not an error if asd already exists */
> @@ -1255,7 +1255,7 @@ v4l2_fwnode_reference_parse_int_props(struct device *dev,
> struct v4l2_async_subdev *asd;
>
> asd = v4l2_async_notifier_add_fwnode_subdev(notifier, fwnode,
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> fwnode_handle_put(fwnode);
> if (IS_ERR(asd)) {
> ret = PTR_ERR(asd);
> diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
> index 6344389e6afa..ef5add079774 100644
> --- a/drivers/staging/media/imx/imx-media-csi.c
> +++ b/drivers/staging/media/imx/imx-media-csi.c
> @@ -1923,7 +1923,7 @@ static int imx_csi_async_register(struct csi_priv *priv)
> FWNODE_GRAPH_ENDPOINT_NEXT);
> if (ep) {
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &priv->notifier, ep, sizeof(*asd));
> + &priv->notifier, ep, struct v4l2_async_subdev);
>
> fwnode_handle_put(ep);
>
> diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c
> index 82e13e972e23..b677cf0e0c84 100644
> --- a/drivers/staging/media/imx/imx-media-of.c
> +++ b/drivers/staging/media/imx/imx-media-of.c
> @@ -31,7 +31,7 @@ int imx_media_of_add_csi(struct imx_media_dev *imxmd,
> /* add CSI fwnode to async notifier */
> asd = v4l2_async_notifier_add_fwnode_subdev(&imxmd->notifier,
> of_fwnode_handle(csi_np),
> - sizeof(*asd));
> + struct v4l2_async_subdev);
> if (IS_ERR(asd)) {
> ret = PTR_ERR(asd);
> if (ret == -EEXIST)
> diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
> index 9457761b7c8b..1b3fef9d0aa9 100644
> --- a/drivers/staging/media/imx/imx6-mipi-csi2.c
> +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
> @@ -578,7 +578,7 @@ static int csi2_async_register(struct csi2_dev *csi2)
> dev_dbg(csi2->dev, "flags: 0x%08x\n", csi2->bus.flags);
>
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &csi2->notifier, ep, sizeof(*asd));
> + &csi2->notifier, ep, struct v4l2_async_subdev);
> fwnode_handle_put(ep);
>
> if (IS_ERR(asd))
> diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
> index 4ea6e0bb274d..9150950b7339 100644
> --- a/drivers/staging/media/imx/imx7-media-csi.c
> +++ b/drivers/staging/media/imx/imx7-media-csi.c
> @@ -1190,7 +1190,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi)
> FWNODE_GRAPH_ENDPOINT_NEXT);
> if (ep) {
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &csi->notifier, ep, sizeof(*asd));
> + &csi->notifier, ep, struct v4l2_async_subdev);
>
> fwnode_handle_put(ep);
>
> diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
> index 32d8e7a824d4..0969ee528e38 100644
> --- a/drivers/staging/media/imx/imx7-mipi-csis.c
> +++ b/drivers/staging/media/imx/imx7-mipi-csis.c
> @@ -1025,7 +1025,7 @@ static int mipi_csis_async_register(struct csi_state *state)
> dev_dbg(state->dev, "flags: 0x%08x\n", state->bus.flags);
>
> asd = v4l2_async_notifier_add_fwnode_remote_subdev(
> - &state->notifier, ep, sizeof(*asd));
> + &state->notifier, ep, struct v4l2_async_subdev);
> if (IS_ERR(asd))
> goto err_parse;
>
> diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
> index 70e1e18644b2..7a09061cda57 100644
> --- a/drivers/staging/media/tegra-video/vi.c
> +++ b/drivers/staging/media/tegra-video/vi.c
> @@ -1788,7 +1788,7 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,
> struct tegra_vi *vi = chan->vi;
> struct fwnode_handle *ep = NULL;
> struct fwnode_handle *remote = NULL;
> - struct v4l2_async_subdev *asd;
> + struct tegra_vi_graph_entity *tvge;
> struct device_node *node = NULL;
> int ret;
>
> @@ -1812,10 +1812,10 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,
> continue;
> }
>
> - asd = v4l2_async_notifier_add_fwnode_subdev(&chan->notifier,
> - remote, sizeof(struct tegra_vi_graph_entity));
> - if (IS_ERR(asd)) {
> - ret = PTR_ERR(asd);
> + tvge = v4l2_async_notifier_add_fwnode_subdev(&chan->notifier,
> + remote, struct tegra_vi_graph_entity);
> + if (IS_ERR(tvge)) {
> + ret = PTR_ERR(tvge);
> dev_err(vi->dev,
> "failed to add subdev to notifier: %d\n", ret);
> fwnode_handle_put(remote);
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 121f7d9dcbe6..72c3f4fe1148 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -189,9 +189,12 @@ int __v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
> * is released later at notifier cleanup time.
> */
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
> - struct fwnode_handle *fwnode,
> - unsigned int asd_struct_size);
> +__v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
> + struct fwnode_handle *fwnode,
> + unsigned int asd_struct_size);
> +#define v4l2_async_notifier_add_fwnode_subdev(__notifier, __fwnode, __type) \
> +((__type *)__v4l2_async_notifier_add_fwnode_subdev(__notifier, __fwnode, \
> + sizeof(__type)))
>
> /**
> * v4l2_async_notifier_add_fwnode_remote_subdev - Allocate and add a fwnode
> @@ -215,9 +218,12 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
> * exception that the fwnode refers to a local endpoint, not the remote one.
> */
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> - struct fwnode_handle *endpoint,
> - unsigned int asd_struct_size);
> +__v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> + struct fwnode_handle *endpoint,
> + unsigned int asd_struct_size);
> +#define v4l2_async_notifier_add_fwnode_remote_subdev(__notifier, __ep, __type) \
> +((__type *)__v4l2_async_notifier_add_fwnode_remote_subdev(__notifier, __ep, \
> + sizeof(__type)))
>
> /**
> * v4l2_async_notifier_add_i2c_subdev - Allocate and add an i2c async
> @@ -235,9 +241,12 @@ v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif,
> * Same as above but for I2C matched sub-devices.
> */
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
> - int adapter_id, unsigned short address,
> - unsigned int asd_struct_size);
> +__v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
> + int adapter_id, unsigned short address,
> + unsigned int asd_struct_size);
> +#define v4l2_async_notifier_add_i2c_subdev(__notifier, __adap, __addr, __type) \
> +((__type *)__v4l2_async_notifier_add_i2c_subdev(__notifier, __adap, __addr, \
> + sizeof(__type)))
>
> /**
> * v4l2_async_notifier_add_devname_subdev - Allocate and add a device-name
> @@ -254,9 +263,12 @@ v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier,
> * Same as above but for device-name matched sub-devices.
> */
> struct v4l2_async_subdev *
> -v4l2_async_notifier_add_devname_subdev(struct v4l2_async_notifier *notifier,
> - const char *device_name,
> - unsigned int asd_struct_size);
> +__v4l2_async_notifier_add_devname_subdev(struct v4l2_async_notifier *notifier,
> + const char *device_name,
> + unsigned int asd_struct_size);
> +#define v4l2_async_notifier_add_devname_subdev(__notifier, __name, __type) \
> +((__type *)__v4l2_async_notifier_add_devname_subdev(__notifier, __name, \
> + sizeof(__type)))
>
> /**
> * v4l2_async_notifier_register - registers a subdevice asynchronous notifier
> --
> Regards,
>
> Laurent Pinchart
>
