V4L2 Async notifier API cleanup
Subsystems (27)
v2 cover V4L2 Async notifier API cleanup
The goal of this series is to make the API more consistent, also fixing all the drivers which are currently misusing the API.
With this change, the v4l2-async functions that add subdevices to a notifier have the same semantics, that is they all allocate a struct v4l2_async_subdev, and take a size argument for drivers to embed struct v4l2_async_subdev in a larger struct.
This makes the struct v4l2_async_subdev allocation model more consistent, and simpler to understand.
The V4L2 sub-devices documentation, as well as the kernel-doc are also improved a bit, clarifying the API.
Finally, all the drivers previously using v4l2_async_notifier_add_subdev are converted to proper helpers, which allows us to rename v4l2_async_notifier_add_subdev to __v4l2_async_notifier_add_subdev, and clarify the documentation so hopefully future drivers will avoid it.
I have tried to convert the drivers in the least invasive way, keeping the original code as much as possible. In many cases, specially the old drivers, there is some bitrot and some room for more cleanups, which is beyond the scope of this patchset.
The series is now rebased on top of these patches:
media: v4l2-async: Remove V4L2_ASYNC_MATCH_CUSTOM
media: v4l2-async: Remove V4L2_ASYNC_MATCH_DEVNAME
media: pxa_camera: Drop the v4l2-clk clock register
media: imx6-mipi-csi2: Call remote subdev get_mbus_config to get active lanes
Changes from v1:
* Add Laurent's follow cleanup, which makes the API safer.
* Fix commit description s/is discouraged/will be discouraged
* Fix missing allocation in renesas-ceu driver.
* Fix missing of_node puts in exynos4-is driver.
* Rework mention of v4l2_fwnode_reference_parse_sensor_common
Ezequiel Garcia (13):
media: v4l2-async: Clean v4l2_async_notifier_add_fwnode_remote_subdev
media: atmel: Use v4l2_async_notifier_add_fwnode_remote_subdev
media: stm32: Use v4l2_async_notifier_add_fwnode_remote_subdev
media: exynos4-is: Use v4l2_async_notifier_add_fwnode_remote_subdev
media: st-mipid02: Use v4l2_async_notifier_add_fwnode_remote_subdev
media: cadence: Use v4l2_async_notifier_add_fwnode_remote_subdev
media: marvell-ccic: Use v4l2_async_notifier_add_*_subdev
media: renesas-ceu: Use v4l2_async_notifier_add_*_subdev
media: pxa-camera: Use v4l2_async_notifier_add_*_subdev
media: davinci: vpif_display: Remove unused v4l2-async code
media: v4l2-async: Fix incorrect comment
media: Clarify v4l2-async subdevice addition API
media: v4l2-async: Discourage use of v4l2_async_notifier_add_subdev
Laurent Pinchart (1):
media: v4l2-async: Improve v4l2_async_notifier_add_*_subdev() API
.../driver-api/media/v4l2-subdev.rst | 38 ++++++-- drivers/media/i2c/max9286.c | 2 +- drivers/media/i2c/st-mipid02.c | 16 ++-- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 15 ++-- drivers/media/platform/am437x/am437x-vpfe.c | 2 +- drivers/media/platform/atmel/atmel-isc.h | 1 + drivers/media/platform/atmel/atmel-isi.c | 46 +++------- .../media/platform/atmel/atmel-sama5d2-isc.c | 44 ++++------ drivers/media/platform/cadence/cdns-csi2rx.c | 17 ++-- drivers/media/platform/davinci/vpif_capture.c | 2 +- drivers/media/platform/davinci/vpif_display.c | 86 ++++-------------- drivers/media/platform/davinci/vpif_display.h | 1 - drivers/media/platform/exynos4-is/media-dev.c | 26 +++--- drivers/media/platform/exynos4-is/media-dev.h | 2 +- .../media/platform/marvell-ccic/cafe-driver.c | 14 ++- .../media/platform/marvell-ccic/mcam-core.c | 10 --- .../media/platform/marvell-ccic/mcam-core.h | 1 - .../media/platform/marvell-ccic/mmp-driver.c | 11 ++- drivers/media/platform/omap3isp/isp.c | 74 ++++++---------- drivers/media/platform/pxa_camera.c | 53 +++++------ 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 | 55 +++++------- .../platform/rockchip/rkisp1/rkisp1-dev.c | 15 +--- drivers/media/platform/stm32/stm32-dcmi.c | 87 +++++++------------ .../platform/sunxi/sun4i-csi/sun4i_csi.c | 9 +- .../platform/sunxi/sun4i-csi/sun4i_csi.h | 1 - drivers/media/platform/ti-vpe/cal.c | 12 ++- drivers/media/platform/video-mux.c | 14 +-- drivers/media/platform/xilinx/xilinx-vipp.c | 10 +-- drivers/media/v4l2-core/v4l2-async.c | 54 ++++++------ drivers/media/v4l2-core/v4l2-fwnode.c | 6 +- drivers/staging/media/imx/imx-media-csi.c | 14 +-- drivers/staging/media/imx/imx-media-of.c | 2 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 19 ++-- drivers/staging/media/imx/imx7-media-csi.c | 16 ++-- drivers/staging/media/imx/imx7-mipi-csis.c | 15 +--- drivers/staging/media/tegra-video/vi.c | 10 +-- include/media/davinci/vpif_types.h | 2 - include/media/v4l2-async.h | 62 ++++++++----- 42 files changed, 367 insertions(+), 517 deletions(-)
Signature · 1 line
2.29.2
PATCH v2 1/14 media: v4l2-async: Clean v4l2_async_notifier_add_fwnode_remote_subdev
Change v4l2_async_notifier_add_fwnode_remote_subdev semantics so it allocates the struct v4l2_async_subdev pointer.
This makes the API consistent: the v4l2-async subdevice addition functions have now a unified usage model. This model is simpler, as it makes v4l2-async responsible for the allocation and release of the subdevice descriptor, and no longer something the driver has to worry about.
On the user side, the change makes the API simpler for the drivers to use and less error-prone.
--- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 17 ++-- drivers/media/platform/omap3isp/isp.c | 79 ++++++++----------- .../platform/rockchip/rkisp1/rkisp1-dev.c | 15 ++-- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 9 ++- .../platform/sunxi/sun4i-csi/sun4i_csi.h | 1 - drivers/media/platform/video-mux.c | 14 +--- drivers/media/v4l2-core/v4l2-async.c | 24 +++--- drivers/staging/media/imx/imx-media-csi.c | 14 +--- drivers/staging/media/imx/imx6-mipi-csi2.c | 19 ++--- drivers/staging/media/imx/imx7-media-csi.c | 16 ++-- drivers/staging/media/imx/imx7-mipi-csis.c | 15 +--- include/media/v4l2-async.h | 15 ++-- 12 files changed, 94 insertions(+), 144 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +7 -10
@@ -1467,7 +1467,8 @@ static int cio2_parse_firmware(struct cio2_device *cio2)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY }; -struct sensor_async_subdev *s_asd =NULL ; +struct sensor_async_subdev *s_asd; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep; ep = fwnode_graph_get_endpoint_by_id(
@@ -1481,27 +1482,23 @@ static int cio2_parse_firmware(struct cio2_device *cio2)if (ret) goto err_parse; - s_asd =kzalloc (sizeof (*s_asd),GFP_KERNEL ); -if (!s_asd) { - ret = -ENOMEM ; + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &cio2->notifier, ep,sizeof (*s_asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); goto err_parse; } + s_asd = container_of(asd, struct sensor_async_subdev, asd); s_asd->csi2.port = vep.base.port; s_asd->csi2.lanes = vep.bus.mipi_csi2.num_data_lanes; - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &cio2->notifier, ep, &s_asd->asd); -if (ret) - goto err_parse; -fwnode_handle_put (ep);continue ; err_parse:fwnode_handle_put (ep); -kfree (s_asd);return ret; }
drivers/media/platform/omap3isp/isp.c +33 -46
117 lines not on this page · raw message
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +5 -10
@@ -252,6 +252,7 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1) .bus_type = V4L2_MBUS_CSI2_DPHY };struct rkisp1_sensor_async *rk_asd =NULL ; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep; ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(rkisp1->dev),
@@ -264,21 +265,16 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)if (ret) goto err_parse; - rk_asd =kzalloc (sizeof (*rk_asd),GFP_KERNEL ); -if (!rk_asd) { - ret = -ENOMEM ; + asd =v4l2_async_notifier_add_fwnode_remote_subdev (ntf, ep, +sizeof (*rk_asd)); +if (IS_ERR (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; - ret =v4l2_async_notifier_add_fwnode_remote_subdev (ntf, ep, - &rk_asd->asd); -if (ret) - goto err_parse; -dev_dbg (rkisp1->dev,"registered ep id %d with %d lanes\n" , vep.base.id, rk_asd->lanes);
@@ -289,7 +285,6 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)continue ; err_parse:fwnode_handle_put (ep); -kfree (rk_asd);v4l2_async_notifier_cleanup (ntf);return ret; }
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +6 -3
@@ -118,6 +118,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_PARALLEL , }; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep;int ret;
@@ -134,10 +135,12 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi) csi->bus = vep.bus.parallel; - ret =v4l2_async_notifier_add_fwnode_remote_subdev (&csi->notifier, - ep, &csi->asd); -if (ret) + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi->notifier, + ep,sizeof (*asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); goto out; + } csi->notifier.ops = &sun4i_csi_notify_ops;
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h +0 -1
@@ -139,7 +139,6 @@ struct sun4i_csi {struct v4l2_mbus_framefmt subdev_fmt;/* V4L2 Async variables */ -struct v4l2_async_subdev asd;struct v4l2_async_notifier notifier;struct v4l2_subdev *src_subdev;int src_pad;
drivers/media/platform/video-mux.c +4 -10
@@ -370,19 +370,13 @@ static int video_mux_async_register(struct video_mux *vmux,if (!ep)continue ; - asd =kzalloc (sizeof (*asd),GFP_KERNEL ); -if (!asd) { -fwnode_handle_put (ep); -return -ENOMEM ; - } - - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &vmux->notifier, ep, asd); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &vmux->notifier, ep,sizeof (*asd));fwnode_handle_put (ep); -if (ret) { -kfree (asd); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);/* OK if asd already exists */ if (ret != -EEXIST )return ret;
drivers/media/v4l2-core/v4l2-async.c +12 -12
@@ -648,26 +648,26 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier, }EXPORT_SYMBOL_GPL (v4l2_async_notifier_add_fwnode_subdev); -int +struct v4l2_async_subdev *v4l2_async_notifier_add_fwnode_remote_subdev (struct v4l2_async_notifier *notif,struct fwnode_handle *endpoint, -struct v4l2_async_subdev *asd) +unsigned int asd_struct_size) { +struct v4l2_async_subdev *asd;struct fwnode_handle *remote; -int ret; remote =fwnode_graph_get_remote_port_parent (endpoint);if (!remote) -return -ENOTCONN ; +return ERR_PTR (ENOTCONN ); - asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; - asd->match.fwnode = remote; - - ret =v4l2_async_notifier_add_subdev (notif, asd); -if (ret) -fwnode_handle_put (remote); - -return ret; + asd =v4l2_async_notifier_add_fwnode_subdev (notif, remote, + asd_struct_size); +/* +* 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);
drivers/staging/media/imx/imx-media-csi.c +4 -10
@@ -1922,19 +1922,13 @@ static int imx_csi_async_register(struct csi_priv *priv) port,0 , FWNODE_GRAPH_ENDPOINT_NEXT);if (ep) { - asd =kzalloc (sizeof (*asd),GFP_KERNEL ); -if (!asd) { -fwnode_handle_put (ep); -return -ENOMEM ; - } - - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &priv->notifier, ep, asd); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &priv->notifier, ep,sizeof (*asd));fwnode_handle_put (ep); -if (ret) { -kfree (asd); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);/* OK if asd already exists */ if (ret != -EEXIST )return ret;
drivers/staging/media/imx/imx6-mipi-csi2.c +6 -13
@@ -641,7 +641,7 @@ static int csi2_async_register(struct csi2_dev *csi2)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY , }; -struct v4l2_async_subdev *asd =NULL ; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep;int ret;
@@ -661,19 +661,13 @@ static int csi2_async_register(struct csi2_dev *csi2)dev_dbg (csi2->dev,"data lanes: %d\n" , vep.bus.mipi_csi2.num_data_lanes);dev_dbg (csi2->dev,"flags: 0x%08x\n" , vep.bus.mipi_csi2.flags); - asd =kzalloc (sizeof (*asd),GFP_KERNEL ); -if (!asd) { - ret = -ENOMEM ; - goto err_parse; - } - - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi2->notifier, ep, asd); -if (ret) - goto err_parse; - + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &csi2->notifier, ep,sizeof (*asd));fwnode_handle_put (ep); +if (IS_ERR (asd)) +return PTR_ERR (asd); + csi2->notifier.ops = &csi2_notify_ops; ret = v4l2_async_subdev_notifier_register(&csi2->sd,
@@ -685,7 +679,6 @@ static int csi2_async_register(struct csi2_dev *csi2) err_parse:fwnode_handle_put (ep); -kfree (asd);return ret; }
drivers/staging/media/imx/imx7-media-csi.c +5 -11
@@ -1180,7 +1180,7 @@ static const struct v4l2_async_notifier_operations imx7_csi_notify_ops = {static int imx7_csi_async_register (struct imx7_csi *csi) { -struct v4l2_async_subdev *asd =NULL ; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep;int ret;
@@ -1189,19 +1189,13 @@ static int imx7_csi_async_register(struct imx7_csi *csi) ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );if (ep) { - asd =kzalloc (sizeof (*asd),GFP_KERNEL ); -if (!asd) { -fwnode_handle_put (ep); -return -ENOMEM ; - } - - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi->notifier, ep, asd); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &csi->notifier, ep,sizeof (*asd));fwnode_handle_put (ep); -if (ret) { -kfree (asd); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);/* OK if asd already exists */ if (ret != -EEXIST )return ret;
drivers/staging/media/imx/imx7-mipi-csis.c +4 -11
@@ -1004,7 +1004,7 @@ static int mipi_csis_async_register(struct csi_state *state)struct v4l2_fwnode_endpoint vep = { .bus_type =V4L2_MBUS_CSI2_DPHY , }; -struct v4l2_async_subdev *asd =NULL ; +struct v4l2_async_subdev *asd;struct fwnode_handle *ep;int ret;
@@ -1024,15 +1024,9 @@ static int mipi_csis_async_register(struct csi_state *state)dev_dbg (state->dev,"data lanes: %d\n" , state->bus.num_data_lanes);dev_dbg (state->dev,"flags: 0x%08x\n" , state->bus.flags); - asd =kzalloc (sizeof (*asd),GFP_KERNEL ); -if (!asd) { - ret = -ENOMEM ; - goto err_parse; - } - - ret =v4l2_async_notifier_add_fwnode_remote_subdev ( - &state->notifier, ep, asd); -if (ret) + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &state->notifier, ep,sizeof (*asd)); +if (IS_ERR (asd)) goto err_parse;fwnode_handle_put (ep);
@@ -1048,7 +1042,6 @@ static int mipi_csis_async_register(struct csi_state *state) err_parse:fwnode_handle_put (ep); -kfree (asd);return ret; }
include/media/v4l2-async.h +8 -7
@@ -174,9 +174,11 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,* * @notif: pointer to &struct v4l2_async_notifier * @endpoint: local endpoint pointing to the remote sub-device to be matched -* @asd: Async sub-device struct allocated by the caller. The &struct -* v4l2_async_subdev shall be the first member of the driver's async -* sub-device struct, i.e. both begin at the same memory address. +* @asd_struct_size: size of the driver's async sub-device struct, including +* sizeof(struct v4l2_async_subdev). The &struct +* v4l2_async_subdev shall be the first member of +* the driver's async sub-device struct, i.e. both +* begin at the same memory address. * * Gets the remote endpoint of a given local endpoint, set it up for fwnode * matching and adds the async sub-device to the notifier's @asd_list. The
@@ -184,13 +186,12 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,* notifier cleanup time. * * This is just like @v4l2_async_notifier_add_fwnode_subdev, but with the -* exception that the fwnode refers to a local endpoint, not the remote one, and -* the function relies on the caller to allocate the async sub-device struct. +* exception that the fwnode refers to a local endpoint, not the remote one. */ -int +struct v4l2_async_subdev *v4l2_async_notifier_add_fwnode_remote_subdev (struct v4l2_async_notifier *notif,struct fwnode_handle *endpoint, -struct v4l2_async_subdev *asd); +unsigned int asd_struct_size);/** * v4l2_async_notifier_add_i2c_subdev - Allocate and add an i2c async
Signature · 1 line
2.29.2
PATCH v2 2/14 media: atmel: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
--- drivers/media/platform/atmel/atmel-isc.h | 1 + drivers/media/platform/atmel/atmel-isi.c | 46 ++++++------------- .../media/platform/atmel/atmel-sama5d2-isc.c | 44 ++++++------------ 3 files changed, 29 insertions(+), 62 deletions(-)
drivers/media/platform/atmel/atmel-isc.h +1 -0
@@ -41,6 +41,7 @@ struct isc_buffer {struct isc_subdev_entity {struct v4l2_subdev *sd;struct v4l2_async_subdev *asd; +struct device_node *epn;struct v4l2_async_notifier notifier;u32 pfe_cfg0;
drivers/media/platform/atmel/atmel-isi.c +13 -33
65 lines not on this page · raw message
drivers/media/platform/atmel/atmel-sama5d2-isc.c +15 -29
85 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v2 2/14 media: stm32-dcmi: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
This results in removal of the now unneeded driver-specific state struct dcmi_graph_entity, keeping track of just the source subdevice.
--- drivers/media/platform/stm32/stm32-dcmi.c | 86 ++++++++--------------- 1 file changed, 30 insertions(+), 56 deletions(-)
drivers/media/platform/stm32/stm32-dcmi.c +30 -56
@@ -99,13 +99,6 @@ enum state {#define OVERRUN_ERROR_THRESHOLD 3 -struct dcmi_graph_entity { -struct v4l2_async_subdev asd; - -struct device_node *remote_node; -struct v4l2_subdev *source; -}; -struct dcmi_format {u32 fourcc;u32 mbus_code;
@@ -139,7 +132,7 @@ struct stm32_dcmi {struct v4l2_device v4l2_dev;struct video_device *vdev;struct v4l2_async_notifier notifier; -struct dcmi_graph_entity entity; +struct v4l2_subdev *source;struct v4l2_format fmt;struct v4l2_rect crop;bool do_crop;
@@ -610,7 +603,7 @@ static int dcmi_pipeline_s_fmt(struct stm32_dcmi *dcmi,struct v4l2_subdev_pad_config *pad_cfg, struct v4l2_subdev_format *format) { - struct media_entity *entity = &dcmi->entity.source->entity; + struct media_entity *entity = &dcmi->source->entity;struct v4l2_subdev *subdev;struct media_pad *sink_pad =NULL ;struct media_pad *src_pad =NULL ;
@@ -1018,7 +1011,7 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1152,7 +1145,7 @@ static int dcmi_get_sensor_format(struct stm32_dcmi *dcmi, };int ret; - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_fmt,NULL , &fmt); + ret =v4l2_subdev_call (dcmi->source, pad, get_fmt,NULL , &fmt);if (ret)return ret;
@@ -1181,7 +1174,7 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1204,7 +1197,7 @@ static int dcmi_get_sensor_bounds(struct stm32_dcmi *dcmi,/* * Get sensor bounds first */ - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_selection, + ret =v4l2_subdev_call (dcmi->source, pad, get_selection,NULL , &bounds);if (!ret) *r = bounds.r;
@@ -1385,7 +1378,7 @@ static int dcmi_enum_framesizes(struct file *file, void *fh, fse.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, enum_frame_size, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_size,NULL , &fse);if (ret)return ret;
@@ -1402,7 +1395,7 @@ static int dcmi_g_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_g_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_g_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_s_parm(struct file *file, void *priv,
@@ -1410,7 +1403,7 @@ static int dcmi_s_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_s_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_s_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_enum_frameintervals(struct file *file, void *fh,
@@ -1432,7 +1425,7 @@ static int dcmi_enum_frameintervals(struct file *file, void *fh, fie.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_interval,NULL , &fie);if (ret)return ret;
@@ -1452,7 +1445,7 @@ MODULE_DEVICE_TABLE(of, stm32_dcmi_of_match);static int dcmi_open (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;int ret;if (mutex_lock_interruptible (&dcmi->lock))
@@ -1483,7 +1476,7 @@ static int dcmi_open(struct file *file)static int dcmi_release (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;bool fh_singular;int ret;
@@ -1616,7 +1609,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi) {const struct dcmi_format *sd_fmts[ARRAY_SIZE (dcmi_formats)];unsigned int num_fmts =0 , i, j; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_mbus_code_enum mbus_code = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , };
@@ -1675,7 +1668,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi)static int dcmi_framesizes_init (struct stm32_dcmi *dcmi) {unsigned int num_fsize =0 ; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_frame_size_enum fse = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , .code = dcmi->sd_format->mbus_code,
@@ -1727,14 +1720,13 @@ static int dcmi_graph_notify_complete(struct v4l2_async_notifier *notifier)* we search for the source subdevice * in order to expose it through V4L2 interface */ - dcmi->entity.source = -media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); -if (!dcmi->entity.source) { + dcmi->source =media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); +if (!dcmi->source) {dev_err (dcmi->dev,"Source subdevice not found\n" );return -ENODEV ; } - dcmi->vdev->ctrl_handler = dcmi->entity.source->ctrl_handler; + dcmi->vdev->ctrl_handler = dcmi->source->ctrl_handler; ret =dcmi_formats_init (dcmi);if (ret) {
@@ -1813,46 +1805,28 @@ static const struct v4l2_async_notifier_operations dcmi_graph_notify_ops = { .complete = dcmi_graph_notify_complete, }; -static int dcmi_graph_parse (struct stm32_dcmi *dcmi,struct device_node *node) -{ -struct device_node *ep =NULL ; -struct device_node *remote; - - ep =of_graph_get_next_endpoint (node, ep); -if (!ep) -return -EINVAL ; - - remote =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!remote) -return -EINVAL ; - -/* Remote node to connect */ - dcmi->entity.remote_node = remote; - dcmi->entity.asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - dcmi->entity.asd.match.fwnode =of_fwnode_handle (remote); -return 0 ; -} -static int dcmi_graph_init (struct stm32_dcmi *dcmi) { +struct v4l2_async_subdev *asd; +struct device_node *ep;int ret; -/* Parse the graph to extract a list of subdevice DT nodes. */ - ret =dcmi_graph_parse (dcmi, dcmi->dev->of_node); -if (ret <0 ) { -dev_err (dcmi->dev,"Failed to parse graph\n" ); -return ret; + ep =of_graph_get_next_endpoint (dcmi->dev->of_node,NULL ); +if (!ep) { +dev_err (dcmi->dev,"Failed to get next endpoint\n" ); +return -EINVAL ; }v4l2_async_notifier_init (&dcmi->notifier); - ret =v4l2_async_notifier_add_subdev (&dcmi->notifier, - &dcmi->entity.asd); -if (ret) { + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &dcmi->notifier,of_fwnode_handle (ep),sizeof (*asd)); + +of_node_put (ep); + +if (IS_ERR (asd)) {dev_err (dcmi->dev,"Failed to add subdev notifier\n" ); -of_node_put (dcmi->entity.remote_node); -return ret; +return PTR_ERR (asd); } dcmi->notifier.ops = &dcmi_graph_notify_ops;
Signature · 1 line
2.29.2
PATCH v2 3/14 media: renesas-ceu: Use v4l2_async_notifier_add_{i2c,fwnode_remote}_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_i2c_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
Using v4l2-async to allocate the driver-specific structs, requires to change struct ceu_subdev so the embedded struct v4l2_async_subdev is now the first element.
--- drivers/media/platform/renesas-ceu.c | 59 +++++++++++++--------------- 1 file changed, 27 insertions(+), 32 deletions(-)
drivers/media/platform/renesas-ceu.c +27 -32
@@ -152,8 +152,8 @@ static inline struct ceu_buffer *vb2_to_ceu(struct vb2_v4l2_buffer *vbuf)* ceu_subdev - Wraps v4l2 sub-device and provides async subdevice. */ struct ceu_subdev { -struct v4l2_subdev *v4l2_sd;struct v4l2_async_subdev asd; +struct v4l2_subdev *v4l2_sd;/* per-subdevice mbus configuration options */ unsigned int mbus_flags;
@@ -174,7 +174,7 @@ struct ceu_device {struct v4l2_device v4l2_dev;/* subdevices descriptors */ -struct ceu_subdev *subdevs; +struct ceu_subdev **subdevs;/* the subdevice currently in use */ struct ceu_subdev *sd;unsigned int sd_index;
@@ -1195,7 +1195,7 @@ static int ceu_enum_input(struct file *file, void *priv,if (inp->index >= ceudev->num_sd)return -EINVAL ; - ceusd = &ceudev->subdevs[inp->index]; + ceusd = ceudev->subdevs[inp->index]; inp->type =V4L2_INPUT_TYPE_CAMERA ; inp->std =0 ;
@@ -1230,7 +1230,7 @@ static int ceu_s_input(struct file *file, void *priv, unsigned int i)return 0 ; ceu_sd_old = ceudev->sd; - ceudev->sd = &ceudev->subdevs[i]; + ceudev->sd = ceudev->subdevs[i];/* * Make sure we can generate output image formats and apply
@@ -1423,7 +1423,7 @@ static int ceu_notify_complete(struct v4l2_async_notifier *notifier)* ceu formats. */ if (!ceudev->sd) { - ceudev->sd = &ceudev->subdevs[0 ]; + ceudev->sd = ceudev->subdevs[0 ]; ceudev->sd_index =0 ; }
@@ -1467,8 +1467,8 @@ static const struct v4l2_async_notifier_operations ceu_notify_ops = {/* * ceu_init_async_subdevs() - Initialize CEU subdevices and async_subdevs in -* ceu device. Both DT and platform data parsing use -* this routine. +* ceu device. Both DT and platform data parsing use +* this routine. * * Returns 0 for success, -ENOMEM for failure. */
@@ -1495,6 +1495,7 @@ 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;
@@ -1510,21 +1511,18 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,/* Setup the ceu subdevice and the async subdevice. */ async_sd = &pdata->subdevs[i]; - ceu_sd = &ceudev->subdevs[i]; - -INIT_LIST_HEAD (&ceu_sd->asd.list); - - ceu_sd->mbus_flags = async_sd->flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - ceu_sd->asd.match.i2c.adapter_id = async_sd->i2c_adapter_id; - ceu_sd->asd.match.i2c.address = async_sd->i2c_address; - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { + asd =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, + async_sd->i2c_adapter_id, + async_sd->i2c_address, +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);v4l2_async_notifier_cleanup (&ceudev->notifier);return ret; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = async_sd->flags; + ceudev->subdevs[i] = ceu_sd; }return pdata->num_subdevs;
@@ -1536,7 +1534,8 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,static int ceu_parse_dt (struct ceu_device *ceudev) {struct device_node *of = ceudev->dev->of_node; -struct device_node *ep, *remote; +struct device_node *ep; +struct v4l2_async_subdev *asd;struct ceu_subdev *ceu_sd;unsigned int i;int num_ep;
@@ -1578,20 +1577,16 @@ static int ceu_parse_dt(struct ceu_device *ceudev) }/* Setup the ceu subdevice and the async subdevice. */ - ceu_sd = &ceudev->subdevs[i]; -INIT_LIST_HEAD (&ceu_sd->asd.list); - - remote =of_graph_get_remote_port_parent (ep); - ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - ceu_sd->asd.match.fwnode =of_fwnode_handle (remote); - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { -of_node_put (remote); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &ceudev->notifier,of_fwnode_handle (ep), +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); goto error_cleanup; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; + ceudev->subdevs[i] = ceu_sd;of_node_put (ep); }
Signature · 1 line
2.29.2
PATCH v2 3/14 media: renesas-ceu: Use v4l2_async_notifier_add_*_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_i2c_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
Using v4l2-async to allocate the driver-specific structs, requires to change struct ceu_subdev so the embedded struct v4l2_async_subdev is now the first element.
--- drivers/media/platform/renesas-ceu.c | 59 +++++++++++++--------------- 1 file changed, 27 insertions(+), 32 deletions(-)
drivers/media/platform/renesas-ceu.c +27 -32
@@ -152,8 +152,8 @@ static inline struct ceu_buffer *vb2_to_ceu(struct vb2_v4l2_buffer *vbuf)* ceu_subdev - Wraps v4l2 sub-device and provides async subdevice. */ struct ceu_subdev { -struct v4l2_subdev *v4l2_sd;struct v4l2_async_subdev asd; +struct v4l2_subdev *v4l2_sd;/* per-subdevice mbus configuration options */ unsigned int mbus_flags;
@@ -174,7 +174,7 @@ struct ceu_device {struct v4l2_device v4l2_dev;/* subdevices descriptors */ -struct ceu_subdev *subdevs; +struct ceu_subdev **subdevs;/* the subdevice currently in use */ struct ceu_subdev *sd;unsigned int sd_index;
@@ -1195,7 +1195,7 @@ static int ceu_enum_input(struct file *file, void *priv,if (inp->index >= ceudev->num_sd)return -EINVAL ; - ceusd = &ceudev->subdevs[inp->index]; + ceusd = ceudev->subdevs[inp->index]; inp->type =V4L2_INPUT_TYPE_CAMERA ; inp->std =0 ;
@@ -1230,7 +1230,7 @@ static int ceu_s_input(struct file *file, void *priv, unsigned int i)return 0 ; ceu_sd_old = ceudev->sd; - ceudev->sd = &ceudev->subdevs[i]; + ceudev->sd = ceudev->subdevs[i];/* * Make sure we can generate output image formats and apply
@@ -1423,7 +1423,7 @@ static int ceu_notify_complete(struct v4l2_async_notifier *notifier)* ceu formats. */ if (!ceudev->sd) { - ceudev->sd = &ceudev->subdevs[0 ]; + ceudev->sd = ceudev->subdevs[0 ]; ceudev->sd_index =0 ; }
@@ -1467,8 +1467,8 @@ static const struct v4l2_async_notifier_operations ceu_notify_ops = {/* * ceu_init_async_subdevs() - Initialize CEU subdevices and async_subdevs in -* ceu device. Both DT and platform data parsing use -* this routine. +* ceu device. Both DT and platform data parsing use +* this routine. * * Returns 0 for success, -ENOMEM for failure. */
@@ -1495,6 +1495,7 @@ 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;
@@ -1510,21 +1511,18 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,/* Setup the ceu subdevice and the async subdevice. */ async_sd = &pdata->subdevs[i]; - ceu_sd = &ceudev->subdevs[i]; - -INIT_LIST_HEAD (&ceu_sd->asd.list); - - ceu_sd->mbus_flags = async_sd->flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - ceu_sd->asd.match.i2c.adapter_id = async_sd->i2c_adapter_id; - ceu_sd->asd.match.i2c.address = async_sd->i2c_address; - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { + asd =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, + async_sd->i2c_adapter_id, + async_sd->i2c_address, +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);v4l2_async_notifier_cleanup (&ceudev->notifier);return ret; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = async_sd->flags; + ceudev->subdevs[i] = ceu_sd; }return pdata->num_subdevs;
@@ -1536,7 +1534,8 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,static int ceu_parse_dt (struct ceu_device *ceudev) {struct device_node *of = ceudev->dev->of_node; -struct device_node *ep, *remote; +struct device_node *ep; +struct v4l2_async_subdev *asd;struct ceu_subdev *ceu_sd;unsigned int i;int num_ep;
@@ -1578,20 +1577,16 @@ static int ceu_parse_dt(struct ceu_device *ceudev) }/* Setup the ceu subdevice and the async subdevice. */ - ceu_sd = &ceudev->subdevs[i]; -INIT_LIST_HEAD (&ceu_sd->asd.list); - - remote =of_graph_get_remote_port_parent (ep); - ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - ceu_sd->asd.match.fwnode =of_fwnode_handle (remote); - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { -of_node_put (remote); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &ceudev->notifier,of_fwnode_handle (ep), +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); goto error_cleanup; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; + ceudev->subdevs[i] = ceu_sd;of_node_put (ep); }
Signature · 1 line
2.29.2
PATCH v2 3/14 media: stm32-dcmi: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
This results in removal of the now unneeded driver-specific state struct dcmi_graph_entity, keeping track of just the source subdevice.
--- drivers/media/platform/stm32/stm32-dcmi.c | 86 ++++++++--------------- 1 file changed, 30 insertions(+), 56 deletions(-)
drivers/media/platform/stm32/stm32-dcmi.c +30 -56
@@ -99,13 +99,6 @@ enum state {#define OVERRUN_ERROR_THRESHOLD 3 -struct dcmi_graph_entity { -struct v4l2_async_subdev asd; - -struct device_node *remote_node; -struct v4l2_subdev *source; -}; -struct dcmi_format {u32 fourcc;u32 mbus_code;
@@ -139,7 +132,7 @@ struct stm32_dcmi {struct v4l2_device v4l2_dev;struct video_device *vdev;struct v4l2_async_notifier notifier; -struct dcmi_graph_entity entity; +struct v4l2_subdev *source;struct v4l2_format fmt;struct v4l2_rect crop;bool do_crop;
@@ -610,7 +603,7 @@ static int dcmi_pipeline_s_fmt(struct stm32_dcmi *dcmi,struct v4l2_subdev_pad_config *pad_cfg, struct v4l2_subdev_format *format) { - struct media_entity *entity = &dcmi->entity.source->entity; + struct media_entity *entity = &dcmi->source->entity;struct v4l2_subdev *subdev;struct media_pad *sink_pad =NULL ;struct media_pad *src_pad =NULL ;
@@ -1018,7 +1011,7 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1152,7 +1145,7 @@ static int dcmi_get_sensor_format(struct stm32_dcmi *dcmi, };int ret; - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_fmt,NULL , &fmt); + ret =v4l2_subdev_call (dcmi->source, pad, get_fmt,NULL , &fmt);if (ret)return ret;
@@ -1181,7 +1174,7 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1204,7 +1197,7 @@ static int dcmi_get_sensor_bounds(struct stm32_dcmi *dcmi,/* * Get sensor bounds first */ - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_selection, + ret =v4l2_subdev_call (dcmi->source, pad, get_selection,NULL , &bounds);if (!ret) *r = bounds.r;
@@ -1385,7 +1378,7 @@ static int dcmi_enum_framesizes(struct file *file, void *fh, fse.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, enum_frame_size, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_size,NULL , &fse);if (ret)return ret;
@@ -1402,7 +1395,7 @@ static int dcmi_g_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_g_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_g_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_s_parm(struct file *file, void *priv,
@@ -1410,7 +1403,7 @@ static int dcmi_s_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_s_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_s_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_enum_frameintervals(struct file *file, void *fh,
@@ -1432,7 +1425,7 @@ static int dcmi_enum_frameintervals(struct file *file, void *fh, fie.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_interval,NULL , &fie);if (ret)return ret;
@@ -1452,7 +1445,7 @@ MODULE_DEVICE_TABLE(of, stm32_dcmi_of_match);static int dcmi_open (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;int ret;if (mutex_lock_interruptible (&dcmi->lock))
@@ -1483,7 +1476,7 @@ static int dcmi_open(struct file *file)static int dcmi_release (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;bool fh_singular;int ret;
@@ -1616,7 +1609,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi) {const struct dcmi_format *sd_fmts[ARRAY_SIZE (dcmi_formats)];unsigned int num_fmts =0 , i, j; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_mbus_code_enum mbus_code = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , };
@@ -1675,7 +1668,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi)static int dcmi_framesizes_init (struct stm32_dcmi *dcmi) {unsigned int num_fsize =0 ; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_frame_size_enum fse = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , .code = dcmi->sd_format->mbus_code,
@@ -1727,14 +1720,13 @@ static int dcmi_graph_notify_complete(struct v4l2_async_notifier *notifier)* we search for the source subdevice * in order to expose it through V4L2 interface */ - dcmi->entity.source = -media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); -if (!dcmi->entity.source) { + dcmi->source =media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); +if (!dcmi->source) {dev_err (dcmi->dev,"Source subdevice not found\n" );return -ENODEV ; } - dcmi->vdev->ctrl_handler = dcmi->entity.source->ctrl_handler; + dcmi->vdev->ctrl_handler = dcmi->source->ctrl_handler; ret =dcmi_formats_init (dcmi);if (ret) {
@@ -1813,46 +1805,28 @@ static const struct v4l2_async_notifier_operations dcmi_graph_notify_ops = { .complete = dcmi_graph_notify_complete, }; -static int dcmi_graph_parse (struct stm32_dcmi *dcmi,struct device_node *node) -{ -struct device_node *ep =NULL ; -struct device_node *remote; - - ep =of_graph_get_next_endpoint (node, ep); -if (!ep) -return -EINVAL ; - - remote =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!remote) -return -EINVAL ; - -/* Remote node to connect */ - dcmi->entity.remote_node = remote; - dcmi->entity.asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - dcmi->entity.asd.match.fwnode =of_fwnode_handle (remote); -return 0 ; -} -static int dcmi_graph_init (struct stm32_dcmi *dcmi) { +struct v4l2_async_subdev *asd; +struct device_node *ep;int ret; -/* Parse the graph to extract a list of subdevice DT nodes. */ - ret =dcmi_graph_parse (dcmi, dcmi->dev->of_node); -if (ret <0 ) { -dev_err (dcmi->dev,"Failed to parse graph\n" ); -return ret; + ep =of_graph_get_next_endpoint (dcmi->dev->of_node,NULL ); +if (!ep) { +dev_err (dcmi->dev,"Failed to get next endpoint\n" ); +return -EINVAL ; }v4l2_async_notifier_init (&dcmi->notifier); - ret =v4l2_async_notifier_add_subdev (&dcmi->notifier, - &dcmi->entity.asd); -if (ret) { + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &dcmi->notifier,of_fwnode_handle (ep),sizeof (*asd)); + +of_node_put (ep); + +if (IS_ERR (asd)) {dev_err (dcmi->dev,"Failed to add subdev notifier\n" ); -of_node_put (dcmi->entity.remote_node); -return ret; +return PTR_ERR (asd); } dcmi->notifier.ops = &dcmi_graph_notify_ops;
Signature · 1 line
2.29.2
PATCH v2 3/14 media: stm32: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
This results in removal of the now unneeded driver-specific state struct dcmi_graph_entity, keeping track of just the source subdevice.
--- drivers/media/platform/stm32/stm32-dcmi.c | 86 ++++++++--------------- 1 file changed, 30 insertions(+), 56 deletions(-)
drivers/media/platform/stm32/stm32-dcmi.c +30 -56
@@ -99,13 +99,6 @@ enum state {#define OVERRUN_ERROR_THRESHOLD 3 -struct dcmi_graph_entity { -struct v4l2_async_subdev asd; - -struct device_node *remote_node; -struct v4l2_subdev *source; -}; -struct dcmi_format {u32 fourcc;u32 mbus_code;
@@ -139,7 +132,7 @@ struct stm32_dcmi {struct v4l2_device v4l2_dev;struct video_device *vdev;struct v4l2_async_notifier notifier; -struct dcmi_graph_entity entity; +struct v4l2_subdev *source;struct v4l2_format fmt;struct v4l2_rect crop;bool do_crop;
@@ -610,7 +603,7 @@ static int dcmi_pipeline_s_fmt(struct stm32_dcmi *dcmi,struct v4l2_subdev_pad_config *pad_cfg, struct v4l2_subdev_format *format) { - struct media_entity *entity = &dcmi->entity.source->entity; + struct media_entity *entity = &dcmi->source->entity;struct v4l2_subdev *subdev;struct media_pad *sink_pad =NULL ;struct media_pad *src_pad =NULL ;
@@ -1018,7 +1011,7 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1152,7 +1145,7 @@ static int dcmi_get_sensor_format(struct stm32_dcmi *dcmi, };int ret; - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_fmt,NULL , &fmt); + ret =v4l2_subdev_call (dcmi->source, pad, get_fmt,NULL , &fmt);if (ret)return ret;
@@ -1181,7 +1174,7 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi, }v4l2_fill_mbus_format (&format.format, pix, sd_fmt->mbus_code); - ret =v4l2_subdev_call (dcmi->entity.source, pad, set_fmt, + ret =v4l2_subdev_call (dcmi->source, pad, set_fmt, &pad_cfg, &format);if (ret <0 )return ret;
@@ -1204,7 +1197,7 @@ static int dcmi_get_sensor_bounds(struct stm32_dcmi *dcmi,/* * Get sensor bounds first */ - ret =v4l2_subdev_call (dcmi->entity.source, pad, get_selection, + ret =v4l2_subdev_call (dcmi->source, pad, get_selection,NULL , &bounds);if (!ret) *r = bounds.r;
@@ -1385,7 +1378,7 @@ static int dcmi_enum_framesizes(struct file *file, void *fh, fse.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, enum_frame_size, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_size,NULL , &fse);if (ret)return ret;
@@ -1402,7 +1395,7 @@ static int dcmi_g_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_g_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_g_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_s_parm(struct file *file, void *priv,
@@ -1410,7 +1403,7 @@ static int dcmi_s_parm(struct file *file, void *priv, {struct stm32_dcmi *dcmi =video_drvdata (file); -return v4l2_s_parm_cap (video_devdata (file), dcmi->entity.source, p); +return v4l2_s_parm_cap (video_devdata (file), dcmi->source, p); } static int dcmi_enum_frameintervals(struct file *file, void *fh,
@@ -1432,7 +1425,7 @@ static int dcmi_enum_frameintervals(struct file *file, void *fh, fie.code = sd_fmt->mbus_code; - ret =v4l2_subdev_call (dcmi->entity.source, pad, + ret =v4l2_subdev_call (dcmi->source, pad, enum_frame_interval,NULL , &fie);if (ret)return ret;
@@ -1452,7 +1445,7 @@ MODULE_DEVICE_TABLE(of, stm32_dcmi_of_match);static int dcmi_open (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;int ret;if (mutex_lock_interruptible (&dcmi->lock))
@@ -1483,7 +1476,7 @@ static int dcmi_open(struct file *file)static int dcmi_release (struct file *file) {struct stm32_dcmi *dcmi =video_drvdata (file); -struct v4l2_subdev *sd = dcmi->entity.source; +struct v4l2_subdev *sd = dcmi->source;bool fh_singular;int ret;
@@ -1616,7 +1609,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi) {const struct dcmi_format *sd_fmts[ARRAY_SIZE (dcmi_formats)];unsigned int num_fmts =0 , i, j; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_mbus_code_enum mbus_code = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , };
@@ -1675,7 +1668,7 @@ static int dcmi_formats_init(struct stm32_dcmi *dcmi)static int dcmi_framesizes_init (struct stm32_dcmi *dcmi) {unsigned int num_fsize =0 ; -struct v4l2_subdev *subdev = dcmi->entity.source; +struct v4l2_subdev *subdev = dcmi->source;struct v4l2_subdev_frame_size_enum fse = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , .code = dcmi->sd_format->mbus_code,
@@ -1727,14 +1720,13 @@ static int dcmi_graph_notify_complete(struct v4l2_async_notifier *notifier)* we search for the source subdevice * in order to expose it through V4L2 interface */ - dcmi->entity.source = -media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); -if (!dcmi->entity.source) { + dcmi->source =media_entity_to_v4l2_subdev (dcmi_find_source (dcmi)); +if (!dcmi->source) {dev_err (dcmi->dev,"Source subdevice not found\n" );return -ENODEV ; } - dcmi->vdev->ctrl_handler = dcmi->entity.source->ctrl_handler; + dcmi->vdev->ctrl_handler = dcmi->source->ctrl_handler; ret =dcmi_formats_init (dcmi);if (ret) {
@@ -1813,46 +1805,28 @@ static const struct v4l2_async_notifier_operations dcmi_graph_notify_ops = { .complete = dcmi_graph_notify_complete, }; -static int dcmi_graph_parse (struct stm32_dcmi *dcmi,struct device_node *node) -{ -struct device_node *ep =NULL ; -struct device_node *remote; - - ep =of_graph_get_next_endpoint (node, ep); -if (!ep) -return -EINVAL ; - - remote =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!remote) -return -EINVAL ; - -/* Remote node to connect */ - dcmi->entity.remote_node = remote; - dcmi->entity.asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - dcmi->entity.asd.match.fwnode =of_fwnode_handle (remote); -return 0 ; -} -static int dcmi_graph_init (struct stm32_dcmi *dcmi) { +struct v4l2_async_subdev *asd; +struct device_node *ep;int ret; -/* Parse the graph to extract a list of subdevice DT nodes. */ - ret =dcmi_graph_parse (dcmi, dcmi->dev->of_node); -if (ret <0 ) { -dev_err (dcmi->dev,"Failed to parse graph\n" ); -return ret; + ep =of_graph_get_next_endpoint (dcmi->dev->of_node,NULL ); +if (!ep) { +dev_err (dcmi->dev,"Failed to get next endpoint\n" ); +return -EINVAL ; }v4l2_async_notifier_init (&dcmi->notifier); - ret =v4l2_async_notifier_add_subdev (&dcmi->notifier, - &dcmi->entity.asd); -if (ret) { + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &dcmi->notifier,of_fwnode_handle (ep),sizeof (*asd)); + +of_node_put (ep); + +if (IS_ERR (asd)) {dev_err (dcmi->dev,"Failed to add subdev notifier\n" ); -of_node_put (dcmi->entity.remote_node); -return ret; +return PTR_ERR (asd); } dcmi->notifier.ops = &dcmi_graph_notify_ops;
Signature · 1 line
2.29.2
PATCH v2 4/14 media: exynos4-is: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/exynos4-is/media-dev.c | 25 +++++++++++-------- drivers/media/platform/exynos4-is/media-dev.h | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/media/platform/exynos4-is/media-dev.c +14 -11
@@ -401,6 +401,7 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,int index = fmd->num_sensors;struct fimc_source_info *pd = &fmd->sensor[index].pdata;struct device_node *rem, *np; +struct v4l2_async_subdev *asd;struct v4l2_fwnode_endpoint endpoint = { .bus_type =0 };int ret;
@@ -418,10 +419,11 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd, pd->mux_id = (endpoint.base.port -1 ) &0x1 ; rem =of_graph_get_remote_port_parent (ep); -of_node_put (ep);if (rem ==NULL ) {v4l2_info (&fmd->v4l2_dev,"Remote device at %pOF not found\n" , ep); +of_node_put (rem); +of_node_put (ep);return 0 ; }
@@ -450,6 +452,7 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,* checking parent's node name. */ np =of_get_parent (rem); +of_node_put (rem);if (of_node_name_eq (np,"i2c-isp" )) pd->fimc_bus_type =FIMC_BUS_TYPE_ISP_WRITEBACK ;
@@ -458,20 +461,19 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,of_node_put (np);if (WARN_ON (index >=ARRAY_SIZE (fmd->sensor))) { -of_node_put (rem); +of_node_put (ep);return -EINVAL ; } - fmd->sensor[index].asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - fmd->sensor[index].asd.match.fwnode =of_fwnode_handle (rem); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &fmd->subdev_notifier,of_fwnode_handle (ep),sizeof (*asd)); - ret =v4l2_async_notifier_add_subdev (&fmd->subdev_notifier, - &fmd->sensor[index].asd); -if (ret) { -of_node_put (rem); -return ret; - } +of_node_put (ep); + +if (IS_ERR (asd)) +return PTR_ERR (asd); + fmd->sensor[index].asd = asd; fmd->num_sensors++;return 0 ;
@@ -1381,7 +1383,8 @@ static int subdev_notifier_bound(struct v4l2_async_notifier *notifier,/* Find platform data for this sensor subdev */ for (i =0 ; i <ARRAY_SIZE (fmd->sensor); i++) -if (fmd->sensor[i].asd.match.fwnode == +if (fmd->sensor[i].asd && + fmd->sensor[i].asd->match.fwnode ==of_fwnode_handle (subdev->dev->of_node)) si = &fmd->sensor[i];
drivers/media/platform/exynos4-is/media-dev.h +1 -1
@@ -83,7 +83,7 @@ struct fimc_camclk_info {*/ struct fimc_sensor_info {struct fimc_source_info pdata; -struct v4l2_async_subdev asd; +struct v4l2_async_subdev *asd;struct v4l2_subdev *subdev;struct fimc_dev *host; };
Signature · 1 line
2.29.2
PATCH v2 5/14 media: st-mipid02: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/i2c/st-mipid02.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/media/i2c/st-mipid02.c +8 -8
@@ -92,7 +92,6 @@ struct mipid02_dev {u64 link_frequency;struct v4l2_fwnode_endpoint tx;/* remote source */ -struct v4l2_async_subdev asd;struct v4l2_async_notifier notifier;struct v4l2_subdev *s_subdev;/* registers */
@@ -844,6 +843,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) {struct v4l2_fwnode_endpoint ep = { .bus_type =V4L2_MBUS_CSI2_DPHY };struct i2c_client *client = bridge->i2c_client; +struct v4l2_async_subdev *asd;struct device_node *ep_node;int ret;
@@ -875,17 +875,17 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) bridge->rx = ep;/* register async notifier so we get noticed when sensor is connected */ - bridge->asd.match.fwnode = -fwnode_graph_get_remote_port_parent (of_fwnode_handle (ep_node)); - bridge->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; +v4l2_async_notifier_init (&bridge->notifier); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &bridge->notifier, +of_fwnode_handle (ep_node), +sizeof (*asd));of_node_put (ep_node); -v4l2_async_notifier_init (&bridge->notifier); - ret =v4l2_async_notifier_add_subdev (&bridge->notifier, &bridge->asd); -if (ret) { +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);dev_err (&client->dev,"fail to register asd to notifier %d" , ret); -fwnode_handle_put (bridge->asd.match.fwnode);return ret; } bridge->notifier.ops = &mipid02_notifier_ops;
Signature · 1 line
2.29.2
PATCH v2 6/14 media: atmel: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
--- drivers/media/platform/atmel/atmel-isc.h | 1 + drivers/media/platform/atmel/atmel-isi.c | 46 ++++++------------- .../media/platform/atmel/atmel-sama5d2-isc.c | 44 ++++++------------ 3 files changed, 29 insertions(+), 62 deletions(-)
drivers/media/platform/atmel/atmel-isc.h +1 -0
@@ -41,6 +41,7 @@ struct isc_buffer {struct isc_subdev_entity {struct v4l2_subdev *sd;struct v4l2_async_subdev *asd; +struct device_node *epn;struct v4l2_async_notifier notifier;u32 pfe_cfg0;
drivers/media/platform/atmel/atmel-isi.c +13 -33
65 lines not on this page · raw message
drivers/media/platform/atmel/atmel-sama5d2-isc.c +15 -29
85 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v2 6/14 media: cadence: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/cadence/cdns-csi2rx.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +6 -10
@@ -81,7 +81,6 @@ struct csi2rx_priv {struct media_pad pads[CSI2RX_PAD_MAX ];/* Remote source */ -struct v4l2_async_subdev asd;struct v4l2_subdev *source_subdev;int source_pad; };
@@ -362,6 +361,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,static int csi2rx_parse_dt (struct csi2rx_priv *csi2rx) {struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 }; +struct v4l2_async_subdev *asd;struct fwnode_handle *fwh;struct device_node *ep;int ret;
@@ -395,17 +395,13 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } - csi2rx->asd.match.fwnode =fwnode_graph_get_remote_port_parent (fwh); - csi2rx->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; -of_node_put (ep); -v4l2_async_notifier_init (&csi2rx->notifier); - ret =v4l2_async_notifier_add_subdev (&csi2rx->notifier, &csi2rx->asd); -if (ret) { -fwnode_handle_put (csi2rx->asd.match.fwnode); -return ret; - } + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, + fwh,sizeof (*asd)); +of_node_put (ep); +if (IS_ERR (asd)) +return PTR_ERR (asd); csi2rx->notifier.ops = &csi2rx_notifier_ops;
Signature · 1 line
2.29.2
PATCH v2 6/14 media: cdns-csi2rx: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/cadence/cdns-csi2rx.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +6 -10
@@ -81,7 +81,6 @@ struct csi2rx_priv {struct media_pad pads[CSI2RX_PAD_MAX ];/* Remote source */ -struct v4l2_async_subdev asd;struct v4l2_subdev *source_subdev;int source_pad; };
@@ -362,6 +361,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,static int csi2rx_parse_dt (struct csi2rx_priv *csi2rx) {struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 }; +struct v4l2_async_subdev *asd;struct fwnode_handle *fwh;struct device_node *ep;int ret;
@@ -395,17 +395,13 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } - csi2rx->asd.match.fwnode =fwnode_graph_get_remote_port_parent (fwh); - csi2rx->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; -of_node_put (ep); -v4l2_async_notifier_init (&csi2rx->notifier); - ret =v4l2_async_notifier_add_subdev (&csi2rx->notifier, &csi2rx->asd); -if (ret) { -fwnode_handle_put (csi2rx->asd.match.fwnode); -return ret; - } + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, + fwh,sizeof (*asd)); +of_node_put (ep); +if (IS_ERR (asd)) +return PTR_ERR (asd); csi2rx->notifier.ops = &csi2rx_notifier_ops;
Signature · 1 line
2.29.2
PATCH v2 7/14 media: cdns-csi2rx: Use v4l2_async_notifier_add_fwnode_remote_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/cadence/cdns-csi2rx.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +6 -10
@@ -81,7 +81,6 @@ struct csi2rx_priv {struct media_pad pads[CSI2RX_PAD_MAX ];/* Remote source */ -struct v4l2_async_subdev asd;struct v4l2_subdev *source_subdev;int source_pad; };
@@ -362,6 +361,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,static int csi2rx_parse_dt (struct csi2rx_priv *csi2rx) {struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 }; +struct v4l2_async_subdev *asd;struct fwnode_handle *fwh;struct device_node *ep;int ret;
@@ -395,17 +395,13 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } - csi2rx->asd.match.fwnode =fwnode_graph_get_remote_port_parent (fwh); - csi2rx->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; -of_node_put (ep); -v4l2_async_notifier_init (&csi2rx->notifier); - ret =v4l2_async_notifier_add_subdev (&csi2rx->notifier, &csi2rx->asd); -if (ret) { -fwnode_handle_put (csi2rx->asd.match.fwnode); -return ret; - } + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, + fwh,sizeof (*asd)); +of_node_put (ep); +if (IS_ERR (asd)) +return PTR_ERR (asd); csi2rx->notifier.ops = &csi2rx_notifier_ops;
Signature · 1 line
2.29.2
PATCH v2 7/14 media: marvell-ccic: Use v4l2_async_notifier_add_*_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/marvell-ccic/cafe-driver.c | 14 +++++++++++--- drivers/media/platform/marvell-ccic/mcam-core.c | 10 ---------- drivers/media/platform/marvell-ccic/mcam-core.h | 1 - drivers/media/platform/marvell-ccic/mmp-driver.c | 11 ++++++++--- 4 files changed, 19 insertions(+), 17 deletions(-)
drivers/media/platform/marvell-ccic/cafe-driver.c +11 -3
@@ -489,6 +489,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,int ret;struct cafe_camera *cam;struct mcam_camera *mcam; +struct v4l2_async_subdev *asd;/* * Start putting together one of our big camera structures.
@@ -546,9 +547,16 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; - mcam->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - mcam->asd.match.i2c.adapter_id =i2c_adapter_id (cam->i2c_adapter); - mcam->asd.match.i2c.address = ov7670_info.addr; +v4l2_async_notifier_init (&mcam->notifier); + + asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier, +i2c_adapter_id (cam->i2c_adapter), + ov7670_info.addr, +sizeof (*asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out_smbus_shutdown; + } ret =mccic_register (mcam);if (ret)
drivers/media/platform/marvell-ccic/mcam-core.c +0 -10
@@ -1866,16 +1866,6 @@ int mccic_register(struct mcam_camera *cam) cam->pix_format = mcam_def_pix_format; cam->mbus_code = mcam_def_mbus_code; -/* -* Register sensor notifier. -*/ -v4l2_async_notifier_init (&cam->notifier); - ret =v4l2_async_notifier_add_subdev (&cam->notifier, &cam->asd); -if (ret) { -cam_warn (cam,"failed to add subdev to a notifier" ); - goto out; - } - cam->notifier.ops = &mccic_notify_ops; ret =v4l2_async_notifier_register (&cam->v4l2_dev, &cam->notifier);if (ret <0 ) {
drivers/media/platform/marvell-ccic/mcam-core.h +0 -1
@@ -151,7 +151,6 @@ struct mcam_camera {*/ struct video_device vdev;struct v4l2_async_notifier notifier; -struct v4l2_async_subdev asd;struct v4l2_subdev *sensor;/* Videobuf2 stuff */
drivers/media/platform/marvell-ccic/mmp-driver.c +8 -3
@@ -180,6 +180,7 @@ static int mmpcam_probe(struct platform_device *pdev)struct resource *res;struct fwnode_handle *ep;struct mmp_camera_platform_data *pdata; +struct v4l2_async_subdev *asd;int ret; cam =devm_kzalloc (&pdev->dev,sizeof (*cam),GFP_KERNEL );
@@ -238,10 +239,15 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; - mcam->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - mcam->asd.match.fwnode =fwnode_graph_get_remote_port_parent (ep); +v4l2_async_notifier_init (&mcam->notifier); + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, + ep,sizeof (*asd));fwnode_handle_put (ep); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out; + }/* * Register the device with the core.
@@ -278,7 +284,6 @@ static int mmpcam_probe(struct platform_device *pdev)pm_runtime_enable (&pdev->dev);return 0 ; out: -fwnode_handle_put (mcam->asd.match.fwnode);mccic_shutdown (mcam);return ret;
Signature · 1 line
2.29.2
PATCH v2 8/14 media: marvell-ccic: Use v4l2_async_notifier_add_{i2c,fwnode_remote}_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/marvell-ccic/cafe-driver.c | 14 +++++++++++--- drivers/media/platform/marvell-ccic/mcam-core.c | 10 ---------- drivers/media/platform/marvell-ccic/mcam-core.h | 1 - drivers/media/platform/marvell-ccic/mmp-driver.c | 11 ++++++++--- 4 files changed, 19 insertions(+), 17 deletions(-)
drivers/media/platform/marvell-ccic/cafe-driver.c +11 -3
@@ -489,6 +489,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,int ret;struct cafe_camera *cam;struct mcam_camera *mcam; +struct v4l2_async_subdev *asd;/* * Start putting together one of our big camera structures.
@@ -546,9 +547,16 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; - mcam->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - mcam->asd.match.i2c.adapter_id =i2c_adapter_id (cam->i2c_adapter); - mcam->asd.match.i2c.address = ov7670_info.addr; +v4l2_async_notifier_init (&mcam->notifier); + + asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier, +i2c_adapter_id (cam->i2c_adapter), + ov7670_info.addr, +sizeof (*asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out_smbus_shutdown; + } ret =mccic_register (mcam);if (ret)
drivers/media/platform/marvell-ccic/mcam-core.c +0 -10
@@ -1866,16 +1866,6 @@ int mccic_register(struct mcam_camera *cam) cam->pix_format = mcam_def_pix_format; cam->mbus_code = mcam_def_mbus_code; -/* -* Register sensor notifier. -*/ -v4l2_async_notifier_init (&cam->notifier); - ret =v4l2_async_notifier_add_subdev (&cam->notifier, &cam->asd); -if (ret) { -cam_warn (cam,"failed to add subdev to a notifier" ); - goto out; - } - cam->notifier.ops = &mccic_notify_ops; ret =v4l2_async_notifier_register (&cam->v4l2_dev, &cam->notifier);if (ret <0 ) {
drivers/media/platform/marvell-ccic/mcam-core.h +0 -1
@@ -151,7 +151,6 @@ struct mcam_camera {*/ struct video_device vdev;struct v4l2_async_notifier notifier; -struct v4l2_async_subdev asd;struct v4l2_subdev *sensor;/* Videobuf2 stuff */
drivers/media/platform/marvell-ccic/mmp-driver.c +8 -3
@@ -180,6 +180,7 @@ static int mmpcam_probe(struct platform_device *pdev)struct resource *res;struct fwnode_handle *ep;struct mmp_camera_platform_data *pdata; +struct v4l2_async_subdev *asd;int ret; cam =devm_kzalloc (&pdev->dev,sizeof (*cam),GFP_KERNEL );
@@ -238,10 +239,15 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; - mcam->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - mcam->asd.match.fwnode =fwnode_graph_get_remote_port_parent (ep); +v4l2_async_notifier_init (&mcam->notifier); + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, + ep,sizeof (*asd));fwnode_handle_put (ep); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out; + }/* * Register the device with the core.
@@ -278,7 +284,6 @@ static int mmpcam_probe(struct platform_device *pdev)pm_runtime_enable (&pdev->dev);return 0 ; out: -fwnode_handle_put (mcam->asd.match.fwnode);mccic_shutdown (mcam);return ret;
Signature · 1 line
2.29.2
PATCH v2 8/14 media: marvell-ccic: Use v4l2_async_notifier_add_*_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/marvell-ccic/cafe-driver.c | 14 +++++++++++--- drivers/media/platform/marvell-ccic/mcam-core.c | 10 ---------- drivers/media/platform/marvell-ccic/mcam-core.h | 1 - drivers/media/platform/marvell-ccic/mmp-driver.c | 11 ++++++++--- 4 files changed, 19 insertions(+), 17 deletions(-)
drivers/media/platform/marvell-ccic/cafe-driver.c +11 -3
@@ -489,6 +489,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,int ret;struct cafe_camera *cam;struct mcam_camera *mcam; +struct v4l2_async_subdev *asd;/* * Start putting together one of our big camera structures.
@@ -546,9 +547,16 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; - mcam->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - mcam->asd.match.i2c.adapter_id =i2c_adapter_id (cam->i2c_adapter); - mcam->asd.match.i2c.address = ov7670_info.addr; +v4l2_async_notifier_init (&mcam->notifier); + + asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier, +i2c_adapter_id (cam->i2c_adapter), + ov7670_info.addr, +sizeof (*asd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out_smbus_shutdown; + } ret =mccic_register (mcam);if (ret)
drivers/media/platform/marvell-ccic/mcam-core.c +0 -10
@@ -1866,16 +1866,6 @@ int mccic_register(struct mcam_camera *cam) cam->pix_format = mcam_def_pix_format; cam->mbus_code = mcam_def_mbus_code; -/* -* Register sensor notifier. -*/ -v4l2_async_notifier_init (&cam->notifier); - ret =v4l2_async_notifier_add_subdev (&cam->notifier, &cam->asd); -if (ret) { -cam_warn (cam,"failed to add subdev to a notifier" ); - goto out; - } - cam->notifier.ops = &mccic_notify_ops; ret =v4l2_async_notifier_register (&cam->v4l2_dev, &cam->notifier);if (ret <0 ) {
drivers/media/platform/marvell-ccic/mcam-core.h +0 -1
@@ -151,7 +151,6 @@ struct mcam_camera {*/ struct video_device vdev;struct v4l2_async_notifier notifier; -struct v4l2_async_subdev asd;struct v4l2_subdev *sensor;/* Videobuf2 stuff */
drivers/media/platform/marvell-ccic/mmp-driver.c +8 -3
@@ -180,6 +180,7 @@ static int mmpcam_probe(struct platform_device *pdev)struct resource *res;struct fwnode_handle *ep;struct mmp_camera_platform_data *pdata; +struct v4l2_async_subdev *asd;int ret; cam =devm_kzalloc (&pdev->dev,sizeof (*cam),GFP_KERNEL );
@@ -238,10 +239,15 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; - mcam->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - mcam->asd.match.fwnode =fwnode_graph_get_remote_port_parent (ep); +v4l2_async_notifier_init (&mcam->notifier); + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, + ep,sizeof (*asd));fwnode_handle_put (ep); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); + goto out; + }/* * Register the device with the core.
@@ -278,7 +284,6 @@ static int mmpcam_probe(struct platform_device *pdev)pm_runtime_enable (&pdev->dev);return 0 ; out: -fwnode_handle_put (mcam->asd.match.fwnode);mccic_shutdown (mcam);return ret;
Signature · 1 line
2.29.2
PATCH v2 8/14 media: renesas-ceu: Use v4l2_async_notifier_add_*_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_i2c_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev, removing some boilerplate code while at it.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
Using v4l2-async to allocate the driver-specific structs, requires to change struct ceu_subdev so the embedded struct v4l2_async_subdev is now the first element.
--- drivers/media/platform/renesas-ceu.c | 59 +++++++++++++--------------- 1 file changed, 27 insertions(+), 32 deletions(-)
drivers/media/platform/renesas-ceu.c +27 -32
@@ -152,8 +152,8 @@ static inline struct ceu_buffer *vb2_to_ceu(struct vb2_v4l2_buffer *vbuf)* ceu_subdev - Wraps v4l2 sub-device and provides async subdevice. */ struct ceu_subdev { -struct v4l2_subdev *v4l2_sd;struct v4l2_async_subdev asd; +struct v4l2_subdev *v4l2_sd;/* per-subdevice mbus configuration options */ unsigned int mbus_flags;
@@ -174,7 +174,7 @@ struct ceu_device {struct v4l2_device v4l2_dev;/* subdevices descriptors */ -struct ceu_subdev *subdevs; +struct ceu_subdev **subdevs;/* the subdevice currently in use */ struct ceu_subdev *sd;unsigned int sd_index;
@@ -1195,7 +1195,7 @@ static int ceu_enum_input(struct file *file, void *priv,if (inp->index >= ceudev->num_sd)return -EINVAL ; - ceusd = &ceudev->subdevs[inp->index]; + ceusd = ceudev->subdevs[inp->index]; inp->type =V4L2_INPUT_TYPE_CAMERA ; inp->std =0 ;
@@ -1230,7 +1230,7 @@ static int ceu_s_input(struct file *file, void *priv, unsigned int i)return 0 ; ceu_sd_old = ceudev->sd; - ceudev->sd = &ceudev->subdevs[i]; + ceudev->sd = ceudev->subdevs[i];/* * Make sure we can generate output image formats and apply
@@ -1423,7 +1423,7 @@ static int ceu_notify_complete(struct v4l2_async_notifier *notifier)* ceu formats. */ if (!ceudev->sd) { - ceudev->sd = &ceudev->subdevs[0 ]; + ceudev->sd = ceudev->subdevs[0 ]; ceudev->sd_index =0 ; }
@@ -1467,8 +1467,8 @@ static const struct v4l2_async_notifier_operations ceu_notify_ops = {/* * ceu_init_async_subdevs() - Initialize CEU subdevices and async_subdevs in -* ceu device. Both DT and platform data parsing use -* this routine. +* ceu device. Both DT and platform data parsing use +* this routine. * * Returns 0 for success, -ENOMEM for failure. */
@@ -1495,6 +1495,7 @@ 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;
@@ -1510,21 +1511,18 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,/* Setup the ceu subdevice and the async subdevice. */ async_sd = &pdata->subdevs[i]; - ceu_sd = &ceudev->subdevs[i]; - -INIT_LIST_HEAD (&ceu_sd->asd.list); - - ceu_sd->mbus_flags = async_sd->flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - ceu_sd->asd.match.i2c.adapter_id = async_sd->i2c_adapter_id; - ceu_sd->asd.match.i2c.address = async_sd->i2c_address; - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { + asd =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, + async_sd->i2c_adapter_id, + async_sd->i2c_address, +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd);v4l2_async_notifier_cleanup (&ceudev->notifier);return ret; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = async_sd->flags; + ceudev->subdevs[i] = ceu_sd; }return pdata->num_subdevs;
@@ -1536,7 +1534,8 @@ static int ceu_parse_platform_data(struct ceu_device *ceudev,static int ceu_parse_dt (struct ceu_device *ceudev) {struct device_node *of = ceudev->dev->of_node; -struct device_node *ep, *remote; +struct device_node *ep; +struct v4l2_async_subdev *asd;struct ceu_subdev *ceu_sd;unsigned int i;int num_ep;
@@ -1578,20 +1577,16 @@ static int ceu_parse_dt(struct ceu_device *ceudev) }/* Setup the ceu subdevice and the async subdevice. */ - ceu_sd = &ceudev->subdevs[i]; -INIT_LIST_HEAD (&ceu_sd->asd.list); - - remote =of_graph_get_remote_port_parent (ep); - ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; - ceu_sd->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; - ceu_sd->asd.match.fwnode =of_fwnode_handle (remote); - - ret =v4l2_async_notifier_add_subdev (&ceudev->notifier, - &ceu_sd->asd); -if (ret) { -of_node_put (remote); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &ceudev->notifier,of_fwnode_handle (ep), +sizeof (*ceu_sd)); +if (IS_ERR (asd)) { + ret =PTR_ERR (asd); goto error_cleanup; } + ceu_sd =to_ceu_subdev (asd); + ceu_sd->mbus_flags = fw_ep.bus.parallel.flags; + ceudev->subdevs[i] = ceu_sd;of_node_put (ep); }
Signature · 1 line
2.29.2
PATCH v2 9/14 media: pxa-camera: Use v4l2_async_notifier_add_*_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/pxa_camera.c | 53 ++++++++++++----------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/media/platform/pxa_camera.c +21 -32
@@ -655,8 +655,6 @@ struct pxa_camera_dev {const struct pxa_camera_format_xlate *current_fmt;struct v4l2_pix_format current_pix; -struct v4l2_async_subdev asd; -/* * PXA27x is only supposed to handle one camera on its Quick Capture * interface. If anyone ever builds hardware to enable more than
@@ -2189,11 +2187,11 @@ static int pxa_camera_resume(struct device *dev) }static int pxa_camera_pdata_from_dt (struct device *dev, -struct pxa_camera_dev *pcdev, -struct v4l2_async_subdev *asd) +struct pxa_camera_dev *pcdev) {u32 mclk_rate; -struct device_node *remote, *np = dev->of_node; +struct v4l2_async_subdev *asd; +struct device_node *np = dev->of_node;struct v4l2_fwnode_endpoint ep = { .bus_type =0 };int err =of_property_read_u32 (np,"clock-frequency" , &mclk_rate);
@@ -2245,13 +2243,12 @@ static int pxa_camera_pdata_from_dt(struct device *dev,if (ep.bus.parallel.flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) pcdev->platform_flags |=PXA_CAMERA_PCLK_EN ; - asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; - remote =of_graph_get_remote_port_parent (np); -if (remote) - asd->match.fwnode =of_fwnode_handle (remote); -else -dev_notice (dev,"no remote for %pOF\n" , np); - + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &pcdev->notifier, +of_fwnode_handle (np), +sizeof (*asd)); +if (IS_ERR (asd)) + err =PTR_ERR (asd); out:of_node_put (np);
@@ -2286,18 +2283,23 @@ static int pxa_camera_probe(struct platform_device *pdev)if (IS_ERR (pcdev->clk))return PTR_ERR (pcdev->clk); +v4l2_async_notifier_init (&pcdev->notifier); pcdev->res = res; - pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) { +struct v4l2_async_subdev *asd; + pcdev->platform_flags = pcdev->pdata->flags; pcdev->mclk = pcdev->pdata->mclk_10khz *10000 ; - pcdev->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - pcdev->asd.match.i2c.adapter_id = - pcdev->pdata->sensor_i2c_adapter_id; - pcdev->asd.match.i2c.address = pcdev->pdata->sensor_i2c_address; + asd =v4l2_async_notifier_add_i2c_subdev ( + &pcdev->notifier, + pcdev->pdata->sensor_i2c_adapter_id, + pcdev->pdata->sensor_i2c_address, +sizeof (*asd)); +if (IS_ERR (asd)) + err =PTR_ERR (asd); }else if (pdev->dev.of_node) { - err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev, &pcdev->asd); + err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev); }else {return -ENODEV ; }
@@ -2389,23 +2391,11 @@ static int pxa_camera_probe(struct platform_device *pdev)if (err) goto exit_deactivate; -v4l2_async_notifier_init (&pcdev->notifier); - - err =v4l2_async_notifier_add_subdev (&pcdev->notifier, &pcdev->asd); -if (err) { -fwnode_handle_put (pcdev->asd.match.fwnode); - goto exit_free_v4l2dev; - } - - pcdev->notifier.ops = &pxa_camera_sensor_ops; - -if (!of_have_populated_dt ()) - pcdev->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - err =pxa_camera_init_videobuf2 (pcdev);if (err) goto exit_notifier_cleanup; + pcdev->notifier.ops = &pxa_camera_sensor_ops; err =v4l2_async_notifier_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) goto exit_notifier_cleanup;
@@ -2413,7 +2403,6 @@ static int pxa_camera_probe(struct platform_device *pdev)return 0 ; exit_notifier_cleanup:v4l2_async_notifier_cleanup (&pcdev->notifier); -exit_free_v4l2dev:v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);
Signature · 1 line
2.29.2
PATCH v2 9/14 media: pxa-camera: Use v4l2_async_notifier_add_{i2c,fwnode_remote}_subdev
In reply to Ezequiel GarciaThe use of v4l2_async_notifier_add_subdev will be discouraged. Drivers are instead encouraged to use a helper such as v4l2_async_notifier_add_fwnode_remote_subdev.
This fixes a misuse of the API, as v4l2_async_notifier_add_subdev should get a kmalloc'ed struct v4l2_async_subdev.
Use the appropriate helper: v4l2_async_notifier_add_i2c_subdev or v4l2_async_notifier_add_fwnode_remote_subdev, which handles the needed setup, instead of open-coding it.
--- drivers/media/platform/pxa_camera.c | 53 ++++++++++++----------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/media/platform/pxa_camera.c +21 -32
@@ -655,8 +655,6 @@ struct pxa_camera_dev {const struct pxa_camera_format_xlate *current_fmt;struct v4l2_pix_format current_pix; -struct v4l2_async_subdev asd; -/* * PXA27x is only supposed to handle one camera on its Quick Capture * interface. If anyone ever builds hardware to enable more than
@@ -2189,11 +2187,11 @@ static int pxa_camera_resume(struct device *dev) }static int pxa_camera_pdata_from_dt (struct device *dev, -struct pxa_camera_dev *pcdev, -struct v4l2_async_subdev *asd) +struct pxa_camera_dev *pcdev) {u32 mclk_rate; -struct device_node *remote, *np = dev->of_node; +struct v4l2_async_subdev *asd; +struct device_node *np = dev->of_node;struct v4l2_fwnode_endpoint ep = { .bus_type =0 };int err =of_property_read_u32 (np,"clock-frequency" , &mclk_rate);
@@ -2245,13 +2243,12 @@ static int pxa_camera_pdata_from_dt(struct device *dev,if (ep.bus.parallel.flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) pcdev->platform_flags |=PXA_CAMERA_PCLK_EN ; - asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; - remote =of_graph_get_remote_port_parent (np); -if (remote) - asd->match.fwnode =of_fwnode_handle (remote); -else -dev_notice (dev,"no remote for %pOF\n" , np); - + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &pcdev->notifier, +of_fwnode_handle (np), +sizeof (*asd)); +if (IS_ERR (asd)) + err =PTR_ERR (asd); out:of_node_put (np);
@@ -2286,18 +2283,23 @@ static int pxa_camera_probe(struct platform_device *pdev)if (IS_ERR (pcdev->clk))return PTR_ERR (pcdev->clk); +v4l2_async_notifier_init (&pcdev->notifier); pcdev->res = res; - pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) { +struct v4l2_async_subdev *asd; + pcdev->platform_flags = pcdev->pdata->flags; pcdev->mclk = pcdev->pdata->mclk_10khz *10000 ; - pcdev->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - pcdev->asd.match.i2c.adapter_id = - pcdev->pdata->sensor_i2c_adapter_id; - pcdev->asd.match.i2c.address = pcdev->pdata->sensor_i2c_address; + asd =v4l2_async_notifier_add_i2c_subdev ( + &pcdev->notifier, + pcdev->pdata->sensor_i2c_adapter_id, + pcdev->pdata->sensor_i2c_address, +sizeof (*asd)); +if (IS_ERR (asd)) + err =PTR_ERR (asd); }else if (pdev->dev.of_node) { - err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev, &pcdev->asd); + err =pxa_camera_pdata_from_dt (&pdev->dev, pcdev); }else {return -ENODEV ; }
@@ -2389,23 +2391,11 @@ static int pxa_camera_probe(struct platform_device *pdev)if (err) goto exit_deactivate; -v4l2_async_notifier_init (&pcdev->notifier); - - err =v4l2_async_notifier_add_subdev (&pcdev->notifier, &pcdev->asd); -if (err) { -fwnode_handle_put (pcdev->asd.match.fwnode); - goto exit_free_v4l2dev; - } - - pcdev->notifier.ops = &pxa_camera_sensor_ops; - -if (!of_have_populated_dt ()) - pcdev->asd.match_type =V4L2_ASYNC_MATCH_I2C ; - err =pxa_camera_init_videobuf2 (pcdev);if (err) goto exit_notifier_cleanup; + pcdev->notifier.ops = &pxa_camera_sensor_ops; err =v4l2_async_notifier_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) goto exit_notifier_cleanup;
@@ -2413,7 +2403,6 @@ static int pxa_camera_probe(struct platform_device *pdev)return 0 ; exit_notifier_cleanup:v4l2_async_notifier_cleanup (&pcdev->notifier); -exit_free_v4l2dev:v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);
Signature · 1 line
2.29.2
PATCH v2 10/14 media: davinci: vpif_display: Remove unused v4l2-async code
In reply to Ezequiel GarciaThere are no users for vpif_display_config.asd_sizes and vpif_display_config.asd members, which means the v4l2-async subdevices aren't being defined anywhere.
Remove the v4l2-async, leaving only the synchronous setup.
--- drivers/media/platform/davinci/vpif_display.c | 86 ++++--------------- drivers/media/platform/davinci/vpif_display.h | 1 - include/media/davinci/vpif_types.h | 2 - 3 files changed, 15 insertions(+), 74 deletions(-)
drivers/media/platform/davinci/vpif_display.c +15 -71
@@ -1117,23 +1117,6 @@ static void free_vpif_objs(void)kfree (vpif_obj.dev[i]); } -static int vpif_async_bound (struct v4l2_async_notifier *notifier, -struct v4l2_subdev *subdev, -struct v4l2_async_subdev *asd) -{ -int i; - -for (i =0 ; i < vpif_obj.config->subdev_count; i++) -if (!strcmp (vpif_obj.config->subdevinfo[i].name, - subdev->name)) { - vpif_obj.sd[i] = subdev; - vpif_obj.sd[i]->grp_id =1 << i; -return 0 ; - } - -return -EINVAL ; -} -static int vpif_probe_complete (void ) {struct common_obj *common;
@@ -1230,16 +1213,6 @@ static int vpif_probe_complete(void)return err; } -static int vpif_async_complete (struct v4l2_async_notifier *notifier) -{ -return vpif_probe_complete (); -} - -static const struct v4l2_async_notifier_operations vpif_async_ops = { - .bound = vpif_async_bound, - .complete = vpif_async_complete, -}; -/* * vpif_probe: This function creates device entries by register itself to the * V4L2 driver and initializes fields of each channel objects
@@ -1294,52 +1267,28 @@ static __init int vpif_probe(struct platform_device *pdev) goto vpif_unregister; } -v4l2_async_notifier_init (&vpif_obj.notifier); - -if (!vpif_obj.config->asd_sizes) { - i2c_adap =i2c_get_adapter (vpif_obj.config->i2c_adapter_id); -for (i =0 ; i < subdev_count; i++) { - vpif_obj.sd[i] = -v4l2_i2c_new_subdev_board (&vpif_obj.v4l2_dev, - i2c_adap, - &subdevdata[i]. - board_info, -NULL ); -if (!vpif_obj.sd[i]) { -vpif_err ("Error registering v4l2 subdevice\n" ); - err = -ENODEV ; - goto probe_subdev_out; - } - -if (vpif_obj.sd[i]) - vpif_obj.sd[i]->grp_id =1 << i; - } - err =vpif_probe_complete (); -if (err) { + i2c_adap =i2c_get_adapter (vpif_obj.config->i2c_adapter_id); +for (i =0 ; i < subdev_count; i++) { + vpif_obj.sd[i] = +v4l2_i2c_new_subdev_board (&vpif_obj.v4l2_dev, + i2c_adap, + &subdevdata[i].board_info, +NULL ); +if (!vpif_obj.sd[i]) { +vpif_err ("Error registering v4l2 subdevice\n" ); + err = -ENODEV ; goto probe_subdev_out; } - }else { -for (i =0 ; i < vpif_obj.config->asd_sizes[0 ]; i++) { - err =v4l2_async_notifier_add_subdev ( - &vpif_obj.notifier, vpif_obj.config->asd[i]); -if (err) - goto probe_cleanup; - } - vpif_obj.notifier.ops = &vpif_async_ops; - err =v4l2_async_notifier_register (&vpif_obj.v4l2_dev, - &vpif_obj.notifier); -if (err) { -vpif_err ("Error registering async notifier\n" ); - err = -EINVAL ; - goto probe_cleanup; - } +if (vpif_obj.sd[i]) + vpif_obj.sd[i]->grp_id =1 << i; } + err =vpif_probe_complete (); +if (err) + goto probe_subdev_out;return 0 ; -probe_cleanup: -v4l2_async_notifier_cleanup (&vpif_obj.notifier); probe_subdev_out:kfree (vpif_obj.sd); vpif_unregister:
@@ -1358,11 +1307,6 @@ static int vpif_remove(struct platform_device *device)struct channel_obj *ch;int i; -if (vpif_obj.config->asd_sizes) { -v4l2_async_notifier_unregister (&vpif_obj.notifier); -v4l2_async_notifier_cleanup (&vpif_obj.notifier); - } -v4l2_device_unregister (&vpif_obj.v4l2_dev);kfree (vpif_obj.sd);
drivers/media/platform/davinci/vpif_display.h +0 -1
@@ -118,7 +118,6 @@ struct vpif_device {struct v4l2_device v4l2_dev;struct channel_obj *dev[VPIF_DISPLAY_NUM_CHANNELS ];struct v4l2_subdev **sd; -struct v4l2_async_notifier notifier;struct vpif_display_config *config; };
include/media/davinci/vpif_types.h +0 -2
@@ -48,8 +48,6 @@ struct vpif_display_config {int i2c_adapter_id;struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS ];const char *card_name; -struct v4l2_async_subdev **asd;/* Flat array, arranged in groups */ -int *asd_sizes;/* 0-terminated array of asd group sizes */ };struct vpif_input {
Signature · 1 line
2.29.2
PATCH v2 11/14 media: v4l2-async: Fix incorrect comment
In reply to Ezequiel GarciaThe v4l2_async_notifier_cleanup() documentation mentions v4l2_fwnode_reference_parse_sensor_common, which was actually introduced as v4l2_async_notifier_parse_fwnode_sensor_common(), in commit 7a9ec808ad46 ("media: v4l: fwnode: Add convenience function for parsing common external refs").
--- include/media/v4l2-async.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/media/v4l2-async.h +1 -1
@@ -250,7 +250,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);* notifier after calling * @v4l2_async_notifier_add_subdev, * @v4l2_async_notifier_parse_fwnode_endpoints or -* @v4l2_fwnode_reference_parse_sensor_common. +* @v4l2_async_notifier_parse_fwnode_sensor_common. * * There is no harm from calling v4l2_async_notifier_cleanup in other * cases as long as its memory has been zeroed after it has been
Signature · 1 line
2.29.2
PATCH v2 12/14 media: Clarify v4l2-async subdevice addition API
In reply to Ezequiel GarciaNow that most users of v4l2_async_notifier_add_subdev have been converted, let's fix the documentation so it's more clear how the v4l2-async API should be used.
--- .../driver-api/media/v4l2-subdev.rst | 38 ++++++++++++++++--- include/media/v4l2-async.h | 11 ++++-- 2 files changed, 41 insertions(+), 8 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +33 -5
@@ -204,11 +204,39 @@ Before registering the notifier, bridge drivers must do two things: first, the notifier must be initialized using the :c:func:`v4l2_async_notifier_init`. Second, bridge drivers can then begin to form a list of subdevice descriptors that the bridge device -needs for its operation. Subdevice descriptors are added to the notifier -using the :c:func:`v4l2_async_notifier_add_subdev` call. This function -takes two arguments: a pointer to struct :c:type:`v4l2_async_notifier`, -and a pointer to the subdevice descripter, which is of type struct -:c:type:`v4l2_async_subdev`. +needs for its operation. Several functions are available, to add subdevice +descriptors to a notifier, depending on the type of device: +:c:func:`v4l2_async_notifier_add_fwnode_subdev`, +:c:func:`v4l2_async_notifier_add_fwnode_remote_subdev` or +:c:func:`v4l2_async_notifier_add_i2c_subdev`. + +These functions allocate a subdevice descriptor, which is of +type struct :c:type:`v4l2_async_subdev`, and take a size argument +which can be used to embed the descriptor in a driver-specific +async subdevice struct. The &struct :c:type:`v4l2_async_subdev` +shall be the first member of this struct: + +.. code-block:: c + + struct my_async_subdev { + struct v4l2_async_subdev asd; + ... + }; + + struct my_async_subdev *my_asd; + struct v4l2_async_subdev *asd; + struct fwnode_handle *ep; + + ... + + asd = v4l2_async_notifier_add_fwnode_subdev( + ¬ifier, ep, sizeof(*my_asd)); + fwnode_handle_put(ep); + + if (IS_ERR(asd)) + return PTR_ERR(asd); + + my_asd = container_of(asd, struct my_async_subdev, asd); The V4L2 core will then use these descriptors to match asynchronously registered subdevices to them. If a match is detected the ``.bound()``
include/media/v4l2-async.h +8 -3
@@ -128,7 +128,11 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);* @notifier: pointer to &struct v4l2_async_notifier * * This function initializes the notifier @asd_list. It must be called -* before the first call to @v4l2_async_notifier_add_subdev. +* before adding a subdevice to a notifier, using one of: +* @v4l2_async_notifier_add_i2c_subdev, +* @v4l2_async_notifier_add_fwnode_subdev, +* @v4l2_async_notifier_add_fwnode_remote_subdev or +* @v4l2_async_notifier_parse_fwnode_sensor_common. */ void v4l2_async_notifier_init (struct v4l2_async_notifier *notifier);
@@ -248,8 +252,9 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);* sub-devices allocated for the purposes of the notifier but not the notifier * itself. The user is responsible for calling this function to clean up the * notifier after calling -* @v4l2_async_notifier_add_subdev, -* @v4l2_async_notifier_parse_fwnode_endpoints or +* @v4l2_async_notifier_add_i2c_subdev, +* @v4l2_async_notifier_add_fwnode_subdev, +* @v4l2_async_notifier_add_fwnode_remote_subdev or * @v4l2_async_notifier_parse_fwnode_sensor_common. * * There is no harm from calling v4l2_async_notifier_cleanup in other
Signature · 1 line
2.29.2
PATCH v2 13/14 media: v4l2-async: Discourage use of v4l2_async_notifier_add_subdev
In reply to Ezequiel GarciaMost -if not all- use-cases are expected to be covered by one of:v4l2_async_notifier_add_fwnode_subdev, v4l2_async_notifier_add_fwnode_remote_subdev or v4l2_async_notifier_add_i2c_subdev.
We'd like to discourage drivers from using v4l2_async_notifier_add_subdev, so rename it as __v4l2_async_notifier_add_subdev. This is typically a good hint for drivers to avoid using the function.
--- drivers/media/v4l2-core/v4l2-async.c | 8 ++++---- drivers/media/v4l2-core/v4l2-fwnode.c | 2 +- include/media/v4l2-async.h | 9 +++++++-- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +4 -4
@@ -603,7 +603,7 @@ void v4l2_async_notifier_cleanup(struct v4l2_async_notifier *notifier) }EXPORT_SYMBOL_GPL (v4l2_async_notifier_cleanup); -int v4l2_async_notifier_add_subdev (struct v4l2_async_notifier *notifier, +int __v4l2_async_notifier_add_subdev (struct v4l2_async_notifier *notifier,struct v4l2_async_subdev *asd) {int ret;
@@ -620,7 +620,7 @@ int v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,mutex_unlock (&list_lock);return ret; } -EXPORT_SYMBOL_GPL (v4l2_async_notifier_add_subdev); +EXPORT_SYMBOL_GPL (__v4l2_async_notifier_add_subdev);struct v4l2_async_subdev * v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,
@@ -637,7 +637,7 @@ v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier, asd->match_type =V4L2_ASYNC_MATCH_FWNODE ; asd->match.fwnode =fwnode_handle_get (fwnode); - ret =v4l2_async_notifier_add_subdev (notifier, asd); + ret =__v4l2_async_notifier_add_subdev (notifier, asd);if (ret) {fwnode_handle_put (fwnode);kfree (asd);
@@ -687,7 +687,7 @@ v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier, asd->match.i2c.adapter_id = adapter_id; asd->match.i2c.address = address; - ret =v4l2_async_notifier_add_subdev (notifier, asd); + ret =__v4l2_async_notifier_add_subdev (notifier, asd);if (ret) {kfree (asd);return ERR_PTR (ret);
drivers/media/v4l2-core/v4l2-fwnode.c +1 -1
@@ -833,7 +833,7 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev,if (ret <0 ) goto out_err; - ret =v4l2_async_notifier_add_subdev (notifier, asd); + ret =__v4l2_async_notifier_add_subdev (notifier, asd);if (ret <0 ) {/* not an error if asd already exists */ if (ret == -EEXIST )
include/media/v4l2-async.h +7 -2
@@ -137,17 +137,22 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);void v4l2_async_notifier_init (struct v4l2_async_notifier *notifier);/** -* v4l2_async_notifier_add_subdev - Add an async subdev to the +* __v4l2_async_notifier_add_subdev - Add an async subdev to the * notifier's master asd list. * * @notifier: pointer to &struct v4l2_async_notifier * @asd: pointer to &struct v4l2_async_subdev * +* \warning: Drivers should avoid using this function and instead use one of: +* @v4l2_async_notifier_add_fwnode_subdev, +* @v4l2_async_notifier_add_fwnode_remote_subdev or +* @v4l2_async_notifier_add_i2c_subdev. +* * Call this function before registering a notifier to link the provided @asd to * the notifiers master @asd_list. The @asd must be allocated with k*alloc() as * it will be freed by the framework when the notifier is destroyed. */ -int v4l2_async_notifier_add_subdev (struct v4l2_async_notifier *notifier, +int __v4l2_async_notifier_add_subdev (struct v4l2_async_notifier *notifier,struct v4l2_async_subdev *asd);/**
Signature · 1 line
2.29.2
PATCH v2 14/14 media: v4l2-async: Improve v4l2_async_notifier_add_*_subdev() API
In reply to Ezequiel GarciaFrom: Laurent Pinchart <[email protected]>
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.
--- 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 | 17 ++++------- 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 | 30 +++++++++---------- 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 | 27 +++++++++++------ 33 files changed, 106 insertions(+), 111 deletions(-)
drivers/media/i2c/max9286.c +1 -1
@@ -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));
drivers/media/i2c/st-mipid02.c +1 -1
@@ -879,7 +879,7 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) asd =v4l2_async_notifier_add_fwnode_remote_subdev ( &bridge->notifier,of_fwnode_handle (ep_node), -sizeof (*asd)); + struct v4l2_async_subdev);of_node_put (ep_node);if (IS_ERR (asd)) {
drivers/media/pci/intel/ipu3/ipu3-cio2.c +4 -6
@@ -1468,7 +1468,6 @@ static int cio2_parse_firmware(struct cio2_device *cio2) .bus_type = V4L2_MBUS_CSI2_DPHY };struct sensor_async_subdev *s_asd; -struct v4l2_async_subdev *asd;struct fwnode_handle *ep; ep = fwnode_graph_get_endpoint_by_id(
@@ -1482,14 +1481,13 @@ static int cio2_parse_firmware(struct cio2_device *cio2)if (ret) goto err_parse; - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &cio2->notifier, ep,sizeof (*s_asd)); -if (IS_ERR (asd)) { - ret =PTR_ERR (asd); + s_asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &cio2->notifier, ep, struct sensor_async_subdev); +if (IS_ERR (s_asd)) { + ret =PTR_ERR (s_asd); goto err_parse; } - s_asd = container_of(asd, struct sensor_async_subdev, asd); s_asd->csi2.port = vep.base.port; s_asd->csi2.lanes = vep.bus.mipi_csi2.num_data_lanes;
drivers/media/platform/am437x/am437x-vpfe.c +1 -1
@@ -2365,7 +2365,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe) pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( &vpfe->notifier,of_fwnode_handle (rem), -sizeof (struct v4l2_async_subdev )); + struct v4l2_async_subdev);of_node_put (rem);if (IS_ERR (pdata->asd[i])) goto cleanup;
drivers/media/platform/atmel/atmel-isi.c +1 -1
@@ -1150,7 +1150,7 @@ static int isi_graph_init(struct atmel_isi *isi) asd =v4l2_async_notifier_add_fwnode_remote_subdev ( &isi->notifier,of_fwnode_handle (ep), -sizeof (*asd)); + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))
drivers/media/platform/atmel/atmel-sama5d2-isc.c +1 -1
@@ -214,7 +214,7 @@ static int atmel_isc_probe(struct platform_device *pdev) asd =v4l2_async_notifier_add_fwnode_remote_subdev ( &subdev_entity->notifier,of_fwnode_handle (subdev_entity->epn), -sizeof (*asd)); + struct v4l2_async_subdev);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
drivers/media/platform/cadence/cdns-csi2rx.c +2 -1
@@ -398,7 +398,8 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)v4l2_async_notifier_init (&csi2rx->notifier); asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, - fwh,sizeof (*asd)); + fwh, + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))return PTR_ERR (asd);
drivers/media/platform/davinci/vpif_capture.c +1 -1
@@ -1584,7 +1584,7 @@ vpif_capture_get_pdata(struct platform_device *pdev) pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( &vpif_obj.notifier,of_fwnode_handle (rem), -sizeof (struct v4l2_async_subdev )); + struct v4l2_async_subdev);if (IS_ERR (pdata->asd[i])) goto err_cleanup;
drivers/media/platform/exynos4-is/media-dev.c +2 -1
@@ -466,7 +466,8 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd, } asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &fmd->subdev_notifier,of_fwnode_handle (ep),sizeof (*asd)); + &fmd->subdev_notifier,of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);
drivers/media/platform/marvell-ccic/cafe-driver.c +1 -1
@@ -552,7 +552,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier,i2c_adapter_id (cam->i2c_adapter), ov7670_info.addr, -sizeof (*asd)); + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out_smbus_shutdown;
drivers/media/platform/marvell-ccic/mmp-driver.c +2 -2
@@ -241,8 +241,8 @@ static int mmpcam_probe(struct platform_device *pdev)v4l2_async_notifier_init (&mcam->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, - ep,sizeof (*asd)); + asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);if (IS_ERR (asd)) { ret =PTR_ERR (asd);
drivers/media/platform/omap3isp/isp.c +6 -11
@@ -2141,7 +2141,6 @@ static int isp_parse_of_endpoints(struct isp_device *isp) {struct fwnode_handle *ep;struct isp_async_subdev *isd =NULL ; -struct v4l2_async_subdev *asd;unsigned int i; ep = fwnode_graph_get_endpoint_by_id(
@@ -2159,12 +2158,10 @@ static int isp_parse_of_endpoints(struct isp_device *isp) ret =v4l2_fwnode_endpoint_parse (ep, &vep);if (!ret) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep,sizeof (*isd)); -if (!IS_ERR (asd)) { - isd = container_of(asd, struct isp_async_subdev, asd); + isd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &isp->notifier, ep, struct isp_async_subdev); +if (!IS_ERR (isd))isp_parse_of_parallel_endpoint (isp->dev, &vep, &isd->bus); - } }fwnode_handle_put (ep);
@@ -2200,12 +2197,10 @@ static int isp_parse_of_endpoints(struct isp_device *isp) }if (!ret) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep,sizeof (*isd)); - -if (!IS_ERR (asd)) { - isd = container_of(asd, struct isp_async_subdev, asd); + isd =v4l2_async_notifier_add_fwnode_remote_subdev ( + &isp->notifier, ep, struct isp_async_subdev); +if (!IS_ERR (isd)) {switch (vep.bus_type) {case V4L2_MBUS_CSI2_DPHY : isd->bus.interface =
drivers/media/platform/pxa_camera.c +2 -2
@@ -2246,7 +2246,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev, asd =v4l2_async_notifier_add_fwnode_remote_subdev ( &pcdev->notifier,of_fwnode_handle (np), -sizeof (*asd)); + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); out:
@@ -2295,7 +2295,7 @@ static int pxa_camera_probe(struct platform_device *pdev) &pcdev->notifier, pcdev->pdata->sensor_i2c_adapter_id, pcdev->pdata->sensor_i2c_address, - sizeof(*asd)); + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); }else if (pdev->dev.of_node) {
drivers/media/platform/qcom/camss/camss.c +4 -7
@@ -655,7 +655,6 @@ static int camss_of_parse_ports(struct camss *camss)for_each_endpoint_of_node (dev->of_node, node) {struct camss_async_subdev *csd; -struct v4l2_async_subdev *asd;if (!of_device_is_available (node))continue ;
@@ -667,17 +666,15 @@ static int camss_of_parse_ports(struct camss *camss) goto err_cleanup; } - asd =v4l2_async_notifier_add_fwnode_subdev ( + csd =v4l2_async_notifier_add_fwnode_subdev ( &camss->notifier,of_fwnode_handle (remote), -sizeof (*csd)); + struct camss_async_subdev);of_node_put (remote); -if (IS_ERR (asd)) { - ret =PTR_ERR (asd); +if (IS_ERR (csd)) { + ret =PTR_ERR (csd); goto err_cleanup; } - csd = container_of(asd, struct camss_async_subdev, asd); - ret =camss_of_parse_endpoint_node (dev, node, csd);if (ret <0 ) goto err_cleanup;
drivers/media/platform/rcar-vin/rcar-core.c +3 -2
@@ -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;
drivers/media/platform/rcar-vin/rcar-csi2.c +1 -1
@@ -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);
drivers/media/platform/rcar_drif.c +1 -1
@@ -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);
drivers/media/platform/renesas-ceu.c +8 -12
@@ -1495,7 +1495,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;
@@ -1511,16 +1510,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, + ceu_sd =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, 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); ceu_sd->mbus_flags = async_sd->flags; ceudev->subdevs[i] = ceu_sd; }
@@ -1535,7 +1533,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;
@@ -1577,14 +1574,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;
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +4 -6
@@ -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;
drivers/media/platform/stm32/stm32-dcmi.c +2 -1
@@ -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);
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +2 -2
@@ -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;
drivers/media/platform/ti-vpe/cal.c +5 -7
@@ -463,23 +463,21 @@ static int cal_async_notifier_register(struct cal_dev *cal)for (i =0 ; i <ARRAY_SIZE (cal->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 || !phy->sensor_node)continue ; fwnode =of_fwnode_handle (phy->sensor_node); - asd =v4l2_async_notifier_add_fwnode_subdev (&cal->notifier, - fwnode, -sizeof (*casd)); -if (IS_ERR (asd)) { + casd =v4l2_async_notifier_add_fwnode_subdev (&cal->notifier, + fwnode, + struct cal_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; }
drivers/media/platform/video-mux.c +1 -1
@@ -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);
drivers/media/platform/xilinx/xilinx-vipp.c +5 -5
@@ -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; } }
drivers/media/v4l2-core/v4l2-async.c +15 -15
@@ -623,9 +623,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;
@@ -646,12 +646,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;
@@ -660,21 +660,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;
@@ -695,7 +695,7 @@ 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);int v4l2_async_register_subdev (struct v4l2_subdev *sd) {
drivers/media/v4l2-core/v4l2-fwnode.c +2 -2
@@ -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);
drivers/staging/media/imx/imx-media-csi.c +1 -1
@@ -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);
drivers/staging/media/imx/imx-media-of.c +1 -1
@@ -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 )
drivers/staging/media/imx/imx6-mipi-csi2.c +1 -1
@@ -662,7 +662,7 @@ static int csi2_async_register(struct csi2_dev *csi2)dev_dbg (csi2->dev,"flags: 0x%08x\n" , vep.bus.mipi_csi2.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))
drivers/staging/media/imx/imx7-media-csi.c +1 -1
@@ -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);
drivers/staging/media/imx/imx7-mipi-csis.c +1 -1
@@ -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;
drivers/staging/media/tegra-video/vi.c +5 -5
@@ -1530,7 +1530,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;
@@ -1554,10 +1554,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);
include/media/v4l2-async.h +18 -9
@@ -172,9 +172,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
@@ -198,9 +201,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
@@ -218,9 +224,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_register - registers a subdevice asynchronous notifier
Signature · 1 line
2.29.2
Seems I messed up something here so I'll resend the whole series. Please ignore this thread :)
Quoted 101 lines · Ezequiel Garcia
The goal of this series is to make the API more consistent, also fixing all the drivers which are currently misusing the API.
With this change, the v4l2-async functions that add subdevices to a notifier have the same semantics, that is they all allocate a struct
v4l2_async_subdev, and take a size argument for drivers to embed structv4l2_async_subdevin a larger struct.This makes the struct
v4l2_async_subdevallocation model more consistent, and simpler to understand.The V4L2 sub-devices documentation, as well as the kernel-doc are also improved a bit, clarifying the API.
Finally, all the drivers previously using
v4l2_async_notifier_add_subdevare converted to proper helpers, which allows us to renamev4l2_async_notifier_add_subdevto__v4l2_async_notifier_add_subdev, and clarify the documentation so hopefully future drivers will avoid it.I have tried to convert the drivers in the least invasive way, keeping the original code as much as possible. In many cases, specially the old drivers, there is some bitrot and some room for more cleanups, which is beyond the scope of this patchset.
The series is now rebased on top of these patches:
media: v4l2-async: RemoveV4L2_ASYNC_MATCH_CUSTOM
media: v4l2-async: RemoveV4L2_ASYNC_MATCH_DEVNAME
media:pxa_camera: Drop the v4l2-clk clock register
media: imx6-mipi-csi2: Call remote subdevget_mbus_configto get active lanesChanges from v1:
* Add Laurent's follow cleanup, which makes the API safer.
* Fix commit description s/is discouraged/will be discouraged
* Fix missing allocation in renesas-ceu driver.
* Fix missingof_nodeputs in exynos4-is driver.
* Rework mention ofv4l2_fwnode_reference_parse_sensor_commonEzequiel Garcia (13):
media: v4l2-async: Cleanv4l2_async_notifier_add_fwnode_remote_subdev
media: atmel: Usev4l2_async_notifier_add_fwnode_remote_subdev
media: stm32: Usev4l2_async_notifier_add_fwnode_remote_subdev
media: exynos4-is: Usev4l2_async_notifier_add_fwnode_remote_subdev
media: st-mipid02: Usev4l2_async_notifier_add_fwnode_remote_subdev
media: cadence: Usev4l2_async_notifier_add_fwnode_remote_subdev
media: marvell-ccic: Use v4l2_async_notifier_add_*_subdev
media: renesas-ceu: Use v4l2_async_notifier_add_*_subdev
media: pxa-camera: Use v4l2_async_notifier_add_*_subdev
media: davinci:vpif_display: Remove unused v4l2-async code
media: v4l2-async: Fix incorrect comment
media: Clarify v4l2-async subdevice addition API
media: v4l2-async: Discourage use ofv4l2_async_notifier_add_subdevLaurent Pinchart (1):
media: v4l2-async: Improve v4l2_async_notifier_add_*_subdev() API.../driver-api/media/v4l2-subdev.rst | 38 ++++++-- drivers/media/i2c/max9286.c | 2 +- drivers/media/i2c/st-mipid02.c | 16 ++-- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 15 ++-- drivers/media/platform/am437x/am437x-vpfe.c | 2 +- drivers/media/platform/atmel/atmel-isc.h | 1 + drivers/media/platform/atmel/atmel-isi.c | 46 +++------- .../media/platform/atmel/atmel-sama5d2-isc.c | 44 ++++------ drivers/media/platform/cadence/cdns-csi2rx.c | 17 ++--
drivers/media/platform/davinci/vpif_capture.c | 2 +- drivers/media/platform/davinci/vpif_display.c | 86 ++++-------------- drivers/media/platform/davinci/vpif_display.h | 1 - drivers/media/platform/exynos4-is/media-dev.c | 26 +++--- drivers/media/platform/exynos4-is/media-dev.h | 2 +- .../media/platform/marvell-ccic/cafe-driver.c | 14 ++-.../media/platform/marvell-ccic/mcam-core.c | 10 --- .../media/platform/marvell-ccic/mcam-core.h | 1 - .../media/platform/marvell-ccic/mmp-driver.c | 11 ++- drivers/media/platform/omap3isp/isp.c | 74 ++++++---------- drivers/media/platform/pxa_camera.c | 53 +++++------ 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 | 55 +++++------- .../platform/rockchip/rkisp1/rkisp1-dev.c | 15 +--- drivers/media/platform/stm32/stm32-dcmi.c | 87 +++++++------------ .../platform/sunxi/sun4i-csi/sun4i_csi.c | 9 +- .../platform/sunxi/sun4i-csi/sun4i_csi.h | 1 - drivers/media/platform/ti-vpe/cal.c | 12 ++- drivers/media/platform/video-mux.c | 14 +-- drivers/media/platform/xilinx/xilinx-vipp.c | 10 +-- drivers/media/v4l2-core/v4l2-async.c | 54 ++++++------ drivers/media/v4l2-core/v4l2-fwnode.c | 6 +- drivers/staging/media/imx/imx-media-csi.c | 14 +-- drivers/staging/media/imx/imx-media-of.c | 2 +-
drivers/staging/media/imx/imx6-mipi-csi2.c | 19 ++-- drivers/staging/media/imx/imx7-media-csi.c | 16 ++-- drivers/staging/media/imx/imx7-mipi-csis.c | 15 +--- drivers/staging/media/tegra-video/vi.c | 10 +-- include/media/davinci/vpif_types.h | 2 - include/media/v4l2-async.h | 62 ++++++++----- 42 files changed, 367 insertions(+), 517 deletions(-)