V4L2 driver documentation, v4l2-async improvements
Subsystems (28)
Sakari Ailus
maintainercover V4L2 driver documentation, v4l2-async improvements
Hi folks,
Here's a refresh of my somewhat old patches, improving V4L2 camera sensor, CSI-2 and parallel interface documentation as well as v4l2-async. I've tried to take feedback into account but unfortunately I no longer have details of that. A lot has been rewritten in the documentation in any case.
I'd like to get these to 5.15 early on (unless somehow 5.14 is possible) so comments would be welcome now.
Note that the documentation of frame rate configuration can be improved, too, but I think that can be after this set.
Niklas Söderlund (2):
media: v4l2-fwnode: Simplify v4l2_async_nf_parse_fwnode_endpoints()
media: rcar-vin: Remove explicit device availability check
Sakari Ailus (4):
Documentation: media: Improve camera sensor documentation
Documentation: media: Fix v4l2-async kerneldoc syntax
v4l: async: Rename async nf functions, clean up long lines
Documentation: v4l: Fix V4L2_CID_PIXEL_RATE documentation
.../driver-api/media/camera-sensor.rst | 45 ++---
Documentation/driver-api/media/index.rst | 2 +-
.../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++-----
.../driver-api/media/v4l2-subdev.rst | 14 +-
.../media/v4l/ext-ctrls-image-process.rst | 4 +-
drivers/media/i2c/max9286.c | 17 +-
drivers/media/i2c/st-mipid02.c | 22 ++-
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 17 +-
drivers/media/platform/am437x/am437x-vpfe.c | 19 +-
drivers/media/platform/atmel/atmel-isc-base.c | 4 +-
drivers/media/platform/atmel/atmel-isi.c | 17 +-
.../media/platform/atmel/atmel-sama5d2-isc.c | 15 +-
.../media/platform/atmel/atmel-sama7g5-isc.c | 8 +-
drivers/media/platform/cadence/cdns-csi2rx.c | 14 +-
drivers/media/platform/davinci/vpif_capture.c | 21 +--
drivers/media/platform/exynos4-is/media-dev.c | 20 +--
.../media/platform/marvell-ccic/cafe-driver.c | 9 +-
.../media/platform/marvell-ccic/mcam-core.c | 10 +-
.../media/platform/marvell-ccic/mmp-driver.c | 6 +-
drivers/media/platform/omap3isp/isp.c | 21 ++-
drivers/media/platform/pxa_camera.c | 26 ++-
drivers/media/platform/qcom/camss/camss.c | 18 +-
drivers/media/platform/rcar-vin/rcar-core.c | 41 ++---
drivers/media/platform/rcar-vin/rcar-csi2.c | 19 +-
drivers/media/platform/rcar_drif.c | 14 +-
drivers/media/platform/renesas-ceu.c | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-dev.c | 17 +-
drivers/media/platform/stm32/stm32-dcmi.c | 18 +-
.../platform/sunxi/sun4i-csi/sun4i_csi.c | 12 +-
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 19 +-
drivers/media/platform/ti-vpe/cal.c | 16 +-
drivers/media/platform/video-mux.c | 17 +-
drivers/media/platform/xilinx/xilinx-vipp.c | 17 +-
drivers/media/v4l2-core/v4l2-async.c | 168 +++++++++---------
drivers/media/v4l2-core/v4l2-fwnode.c | 83 +++------
drivers/staging/media/imx/imx-media-csi.c | 17 +-
.../staging/media/imx/imx-media-dev-common.c | 7 +-
drivers/staging/media/imx/imx-media-dev.c | 6 +-
drivers/staging/media/imx/imx-media-of.c | 6 +-
drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +-
drivers/staging/media/imx/imx7-media-csi.c | 24 +--
drivers/staging/media/imx/imx7-mipi-csis.c | 16 +-
drivers/staging/media/tegra-video/vi.c | 17 +-
include/media/v4l2-async.h | 105 ++++++-----
include/media/v4l2-fwnode.h | 12 +-
45 files changed, 554 insertions(+), 586 deletions(-)
rename Documentation/driver-api/media/{csi2.rst => tx-rx.rst} (39%)Signature · 1 line
2.30.2
Sakari Ailus
maintainerPATCH 1/6 Documentation: media: Improve camera sensor documentation
Modernise the documentation to make it more precise and update the use of pixel rate control and various other changes. In particular:
- Use non-proportional font for file names, properties as well as controls.
- The unit of the HBLANK control is pixels, not lines.
- The unit of PIXEL_RATE control is pixels per second, not Hz.
- Merge common requirements for CSI-2 and parallel busses.
- Include all DT properties needed for assigned clocks.
- Fix referencing the link rate control.
- SMIA driver's new name is CCS driver.
- The PIXEL_RATE control denotes pixel rate on the pixel array on camera sensors. Do not suggest it is used to tell the maximum pixel rate on the bus anymore.
- Improve ReST syntax (plain struct and function names).
- Remove the suggestion to use s_power() in receiver drivers.
- Make MIPI website URL use HTTPS, add Wikipedia links to BT.601 and BT.656.
---
.../driver-api/media/camera-sensor.rst | 45 +++----
Documentation/driver-api/media/index.rst | 2 +-
.../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++++++-------
.../media/v4l/ext-ctrls-image-process.rst | 2 +
4 files changed, 90 insertions(+), 73 deletions(-)
rename Documentation/driver-api/media/{csi2.rst => tx-rx.rst} (39%)Documentation/driver-api/media/camera-sensor.rst +17 -28
@@ -3,10 +3,10 @@ Writing camera sensor drivers ============================= -CSI-2 ------ +CSI-2 and parallel (BT.601 and BT.656) busses +--------------------------------------------- -Please see what is written on :ref:`MIPI_CSI_2`. +Please see :ref:`transmitter-receiver`. Handling clocks ---------------
@@ -26,15 +26,16 @@ user. ACPI ~~~~ -Read the "clock-frequency" _DSD property to denote the frequency. The driver can -rely on this frequency being used. +Read the ``clock-frequency`` _DSD property to denote the frequency. The driver +can rely on this frequency being used. Devicetree ~~~~~~~~~~ -The currently preferred way to achieve this is using "assigned-clock-rates" -property. See Documentation/devicetree/bindings/clock/clock-bindings.txt for -more information. The driver then gets the frequency using clk_get_rate(). +The currently preferred way to achieve this is using ``assigned-clocks``, +``assigned-clock-parents`` and ``assigned-clock-rates`` properties. See +``Documentation/devicetree/bindings/clock/clock-bindings.txt`` for more +information. The driver then gets the frequency using ``clk_get_rate()``. This approach has the drawback that there's no guarantee that the frequency hasn't been modified directly or indirectly by another driver, or supported by
@@ -55,7 +56,7 @@ processing pipeline as one or more sub-devices with different cropping and scaling configurations. The output size of the device is the result of a series of cropping and scaling operations from the device's pixel array's size. -An example of such a driver is the smiapp driver (see drivers/media/i2c/smiapp). +An example of such a driver is the CCS driver (see ``drivers/media/i2c/ccs``). Register list based drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,7 +68,7 @@ level are independent. How a driver picks such configuration is based on the format set on a source pad at the end of the device's internal pipeline. Most sensor drivers are implemented this way, see e.g. -drivers/media/i2c/imx319.c for an example. +``drivers/media/i2c/imx319.c`` for an example. Frame interval configuration ----------------------------
@@ -94,9 +95,10 @@ large variety of devices beyond camera sensors. Devices that have no analogue crop, use the full source image size, i.e. pixel array size. Horizontal and vertical blanking are specified by ``V4L2_CID_HBLANK`` and -``V4L2_CID_VBLANK``, respectively. The unit of these controls are lines. The -pixel rate is specified by ``V4L2_CID_PIXEL_RATE`` in the same sub-device. The -unit of that control is Hz. +``V4L2_CID_VBLANK``, respectively. The unit of the ``V4L2_CID_HBLANK`` control +is pixels and the unit of the ``V4L2_CID_VBLANK`` is lines. The pixel rate in +the sensor's **pixel array** is specified by ``V4L2_CID_PIXEL_RATE`` in the same +sub-device. The unit of that control is pixels per second. Register list based drivers need to implement read-only sub-device nodes for the purpose. Devices that are not register list based need these to configure the
@@ -125,14 +127,14 @@ general, the device must be powered on at least when its registers are being accessed and when it is streaming. Existing camera sensor drivers may rely on the old -:c:type:`v4l2_subdev_core_ops`->s_power() callback for bridge or ISP drivers to +struct v4l2_subdev_core_ops->s_power() callback for bridge or ISP drivers to manage their power state. This is however **deprecated**. If you feel you need to begin calling an s_power from an ISP or a bridge driver, instead please add runtime PM support to the sensor driver you are using. Likewise, new drivers should not use s_power. Please see examples in e.g. ``drivers/media/i2c/ov8856.c`` and -``drivers/media/i2c/smiapp/smiapp-core.c``. The two drivers work in both ACPI +``drivers/media/i2c/ccs/ccs-core.c``. The two drivers work in both ACPI and DT based systems. Control framework
@@ -149,16 +151,3 @@ used to obtain device's power state after the power state transition: The function returns a non-zero value if it succeeded getting the power count or runtime PM was disabled, in either of which cases the driver may proceed to access the device. - -Controls --------- - -For camera sensors that are connected to a bus where transmitter and receiver -require common configuration set by drivers, such as CSI-2 or parallel (BT.601 -or BT.656) bus, the ``V4L2_CID_LINK_FREQ`` control is mandatory on transmitter -drivers. Receiver drivers can use the ``V4L2_CID_LINK_FREQ`` to query the -frequency used on the bus. - -The transmitter drivers should also implement ``V4L2_CID_PIXEL_RATE`` control in -order to tell the maximum pixel rate to the receiver. This is required on raw -camera sensors.
Documentation/driver-api/media/index.rst +1 -1
@@ -37,7 +37,7 @@ Documentation/userspace-api/media/index.rst rc-core mc-core cec-core - csi2 + tx-rx camera-sensor drivers/index
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +70 -44
156 lines not on this page · raw message
Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst +2 -0
@@ -20,6 +20,8 @@ Image Process Control IDs ``V4L2_CID_IMAGE_PROC_CLASS (class)`` The IMAGE_PROC class descriptor. +.. _v4l2-cid-link-freq: + ``V4L2_CID_LINK_FREQ (integer menu)`` Data bus frequency. Together with the media bus pixel code, bus type (clock cycles per sample), the data bus frequency defines the pixel
Signature · 1 line
2.30.2
Re: [PATCH 1/6] Documentation: media: Improve camera sensor documentation
Hi Sakari,
thanks for addressing comments on v1
just a few minros, the rest looks very good!
Quoted 166 lines · Sakari Ailus
Modernise the documentation to make it more precise and update the use of pixel rate control and various other changes. In particular:
- Use non-proportional font for file names, properties as well as controls.
- The unit of the HBLANK control is pixels, not lines.
- The unit of
PIXEL_RATEcontrol is pixels per second, not Hz.- Merge common requirements for CSI-2 and parallel busses.
- Include all DT properties needed for assigned clocks.
- Fix referencing the link rate control.
- SMIA driver's new name is CCS driver.
- The
PIXEL_RATEcontrol denotes pixel rate on the pixel array on camera sensors. Do not suggest it is used to tell the maximum pixel rate on the bus anymore.- Improve ReST syntax (plain struct and function names).
- Remove the suggestion to use
s_power()in receiver drivers.- Make MIPI website URL use HTTPS, add Wikipedia links to BT.601 and BT.656.
Fixes e4cf8c58af75 ("media: Documentation: media: Document how to write camera sensor drivers")Signed-off-by Sakari Ailus <[email protected]>--- .../driver-api/media/camera-sensor.rst | 45 +++---- Documentation/driver-api/media/index.rst | 2 +- .../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++++++------- .../media/v4l/ext-ctrls-image-process.rst | 2 + 4 files changed, 90 insertions(+), 73 deletions(-) rename Documentation/driver-api/media/{csi2.rst => tx-rx.rst} (39%)Documentation/driver-api/media/camera-sensor.rst +17
-28@@ -3,10 +3,10 @@ Writing camera sensor drivers ============================= -CSI-2 ------ +CSI-2 and parallel (BT.601 and BT.656) busses +--------------------------------------------- -Please see what is written on :ref:`MIPI_CSI_2`. +Please see :ref:`transmitter-receiver`. Handling clocks ---------------@@ -26,15 +26,16 @@ user. ACPI ~~~~ -Read the "clock-frequency" _DSD property to denote the frequency. The driver can -rely on this frequency being used. +Read the ``clock-frequency`` _DSD property to denote the frequency. The driver +can rely on this frequency being used. Devicetree ~~~~~~~~~~ -The currently preferred way to achieve this is using "assigned-clock-rates" -property. See Documentation/devicetree/bindings/clock/clock-bindings.txt for -more information. The driver then gets the frequency using clk_get_rate(). +The currently preferred way to achieve this is using ``assigned-clocks``, +``assigned-clock-parents`` and ``assigned-clock-rates`` properties. See +``Documentation/devicetree/bindings/clock/clock-bindings.txt`` for more +information. The driver then gets the frequency using ``clk_get_rate()``. This approach has the drawback that there's no guarantee that the frequency hasn't been modified directly or indirectly by another driver, or supported by@@ -55,7 +56,7 @@ processing pipeline as one or more sub-devices with different cropping and scaling configurations. The output size of the device is the result of a series of cropping and scaling operations from the device's pixel array's size. -An example of such a driver is the smiapp driver (see drivers/media/i2c/smiapp). +An example of such a driver is the CCS driver (see ``drivers/media/i2c/ccs``). Register list based drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~@@ -67,7 +68,7 @@ level are independent. How a driver picks such configuration is based on the format set on a source pad at the end of the device's internal pipeline. Most sensor drivers are implemented this way, see e.g. -drivers/media/i2c/imx319.c for an example. +``drivers/media/i2c/imx319.c`` for an example. Frame interval configuration ----------------------------@@ -94,9 +95,10 @@ large variety of devices beyond camera sensors. Devices that have no analogue crop, use the full source image size, i.e. pixel array size. Horizontal and vertical blanking are specified by ``V4L2_CID_HBLANK`` and -``V4L2_CID_VBLANK``, respectively. The unit of these controls are lines. The -pixel rate is specified by ``V4L2_CID_PIXEL_RATE`` in the same sub-device. The -unit of that control is Hz. +``V4L2_CID_VBLANK``, respectively. The unit of the ``V4L2_CID_HBLANK`` control +is pixels and the unit of the ``V4L2_CID_VBLANK`` is lines. The pixel rate in +the sensor's **pixel array** is specified by ``V4L2_CID_PIXEL_RATE`` in the same +sub-device. The unit of that control is pixels per second. Register list based drivers need to implement read-only sub-device nodes for the purpose. Devices that are not register list based need these to configure the@@ -125,14 +127,14 @@ general, the device must be powered on at least when its registers are being accessed and when it is streaming. Existing camera sensor drivers may rely on the old -:c:type:`v4l2_subdev_core_ops`->s_power() callback for bridge or ISP drivers to +struct v4l2_subdev_core_ops->s_power() callback for bridge or ISP drivers to manage their power state. This is however **deprecated**. If you feel you need to begin calling an s_power from an ISP or a bridge driver, instead please add runtime PM support to the sensor driver you are using. Likewise, new drivers should not use s_power. Please see examples in e.g. ``drivers/media/i2c/ov8856.c`` and -``drivers/media/i2c/smiapp/smiapp-core.c``. The two drivers work in both ACPI +``drivers/media/i2c/ccs/ccs-core.c``. The two drivers work in both ACPI and DT based systems. Control framework@@ -149,16 +151,3 @@ used to obtain device's power state after the power state transition: The function returns a non-zero value if it succeeded getting the power count or runtime PM was disabled, in either of which cases the driver may proceed to access the device. - -Controls --------- - -For camera sensors that are connected to a bus where transmitter and receiver -require common configuration set by drivers, such as CSI-2 or parallel (BT.601 -or BT.656) bus, the ``V4L2_CID_LINK_FREQ`` control is mandatory on transmitter -drivers. Receiver drivers can use the ``V4L2_CID_LINK_FREQ`` to query the -frequency used on the bus. - -The transmitter drivers should also implement ``V4L2_CID_PIXEL_RATE`` control in -order to tell the maximum pixel rate to the receiver. This is required on raw -camera sensors.Documentation/driver-api/media/index.rst +1
-1@@ -37,7 +37,7 @@ Documentation/userspace-api/media/index.rst rc-core mc-core cec-core - csi2 + tx-rx camera-sensor drivers/indexDocumentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +0
-0
Documentation/driver-api/media/tx-rx.rst line 8
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +6
-1@@ -1,39 +1,71 @@ .. SPDX-License-Identifier: GPL-2.0 -.. _MIPI_CSI_2: +.. _transmitter-receiver: + +Pixel data transmitter and receiver drivers +=========================================== + +V4L2 supports various devices that transmit and receiver pixel data. Examples of
s/and receiver/and receives/
Quoted 40 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +15
-13+these devices include a camera sensor, a TV tuner and a parallel or a CSI-2 +receiver in an SoC. + +Bus types +--------- + +The following busses are the most common. This section discusses these two only. MIPI CSI-2 -========== +^^^^^^^^^^ CSI-2 is a data bus intended for transferring images from cameras to the host SoC. It is defined by the `MIPI alliance`_. -.. _`MIPI alliance`: http://www.mipi.org/ +.. _`MIPI alliance`: https://www.mipi.org/ -Media bus formats ------------------ +Parallel +^^^^^^^^ -See :ref:`v4l2-mbus-pixelcode` for details on which media bus formats should -be used for CSI-2 interfaces. +`BT.601`_ and `BT.656`_ are the most common parallel busses. + +.. _`BT.601`: https://en.wikipedia.org/wiki/Rec._601 +.. _`BT.656`: https://en.wikipedia.org/wiki/ITU-R_BT.656 Transmitter drivers ------------------- -CSI-2 transmitter, such as a sensor or a TV tuner, drivers need to -provide the CSI-2 receiver with information on the CSI-2 bus -configuration. These include the V4L2_CID_LINK_FREQ and -V4L2_CID_PIXEL_RATE controls and -(:c:type:`v4l2_subdev_video_ops`->s_stream() callback). These -interface elements must be present on the sub-device represents the -CSI-2 transmitter.
Documentation/driver-api/media/tx-rx.rst line 45
Quoted 10 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +10
-0+Transmitter drivers generally need to provide the receiver drivers with the +configuration of the transmitter. What is required depends on the type of the +bus. These are common for both busses. + +Media bus pixel code +^^^^^^^^^^^^^^^^^^^^ + +The media bus pixel codes document parallel formats. Should the pixel data be +transported over a serial bus, the media bus pixel code that describes a +parallel format that transfers a sample on a single clock cycle is used.
I guess you intend to document that, in example, MEDIA_BUS_FMT_YUYV8_2X8 has to be used on parallel busses, as the bus width is meaningful, while MEDIA_BUS_FMT_YUYV8_1X16 should be used on serial busses as the bus width it's not. I guess this could be reported as an example ?
Quoted 48 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-8+ +See :ref:`v4l2-mbus-pixelcode`. + +Link frequency +^^^^^^^^^^^^^^ + +The :ref:`V4L2_CID_LINK_FREQ <v4l2-cid-link-freq>` control is used to tell the +receiver the frequency of the bus (i.e. it is not the same as the symbol rate). + +``.s_stream()`` callback +^^^^^^^^^^^^^^^^^^^^^^^^ -The V4L2_CID_LINK_FREQ control is used to tell the receiver driver the -frequency (and not the symbol rate) of the link. The V4L2_CID_PIXEL_RATE -control may be used by the receiver to obtain the pixel rate the transmitter -uses. The :c:type:`v4l2_subdev_video_ops`->s_stream() callback provides an -ability to start and stop the stream. +The struct struct v4l2_subdev_video_ops->s_stream() callback is used by the +receiver driver to control the transmitter driver's streaming state. -The value of the V4L2_CID_PIXEL_RATE is calculated as follows:: + +CSI-2 transmitter drivers +------------------------- + +Pixel rate +^^^^^^^^^^ + +The pixel rate on the bus is calculated as follows:: pixel_rate = link_freq * 2 * nr_of_lanes * 16 / k / bits_per_sample@@ -45,27 +77,38 @@ where * - variable or constant - description * - link_freq - - The value of the V4L2_CID_LINK_FREQ integer64 menu item. + - The value of the ``V4L2_CID_LINK_FREQ`` integer64 menu item. * - nr_of_lanes - Number of data lanes used on the CSI-2 link. This can be obtained from the OF endpoint configuration. * - 2 - - Two bits are transferred per clock cycle per lane. + - Data is transferred on both rising and falling edge of the signal. * - bits_per_sample - Number of bits per sample. * - k - 16 for D-PHY and 7 for C-PHY
Documentation/driver-api/media/tx-rx.rst where · line 94
Quoted 10 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +4
-5-The transmitter drivers must, if possible, configure the CSI-2 -transmitter to *LP-11 mode* whenever the transmitter is powered on but -not active, and maintain *LP-11 mode* until stream on. Only at stream -on should the transmitter activate the clock on the clock lane and -transition to *HS mode*. +.. note:: + + The pixel rate calculated this way is **not** be the same thing than + the pixel rate on the camera sensor's pixel array.
.. as reported by the V4L2_CID_PIXEL_RATE control.
Documentation/driver-api/media/tx-rx.rst where · line 99
Quoted 5 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +5
-0+ +LP-11 and LP-111 modes +^^^^^^^^^^^^^^^^^^^^^^ + +The transmitter drivers must, if possible, configure the CSI-2 transmitter to
s/drivers/driver/
Or if you want to keep it plural drop "The" ?
Documentation/driver-api/media/tx-rx.rst where · line 102
Quoted 3 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-0+*LP-11 or LP-111 mode* whenever the transmitter is powered on but not active, +and maintain *LP-11 or LP-111 mode* until stream on. Only at stream on should +the transmitter activate the clock on the clock lane and transition to *HS
"Only at stream on time the transmitter should"
Sounds better to me, but not being a native speaker I might very well be wrong :)
All minors, thanks for clearing this up
Thanks
j
Quoted 49 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +4
-17+mode*. Some transmitters do this automatically but some have to be explicitly programmed to do so, and some are unable to do so altogether due to hardware constraints. +The receiver thus need to be configured to expect LP-11 or LP-111 mode from the +transmitter before the transmitter driver's ``.s_stream()`` op is called. + Stopping the transmitter ^^^^^^^^^^^^^^^^^^^^^^^^@@ -75,20 +118,3 @@ stream at a frame boundary whereas others stop immediately, effectively leaving the current frame unfinished. The receiver driver should not make assumptions either way, but function properly in both cases. - -Receiver drivers ----------------- - -Before the receiver driver may enable the CSI-2 transmitter by using -the :c:type:`v4l2_subdev_video_ops`->s_stream(), it must have powered -the transmitter up by using the -:c:type:`v4l2_subdev_core_ops`->s_power() callback. This may take -place either indirectly by using :c:func:`v4l2_pipeline_pm_get` or -directly. - -Formats -------- - -The media bus pixel codes document parallel formats. Should the pixel data be -transported over a serial bus, the media bus pixel code that describes a -parallel format that transfers a sample on a single clock cycle is used.Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst +2
-1@@ -20,6 +20,8 @@ Image Process Control IDs ``V4L2_CID_IMAGE_PROC_CLASS (class)`` The IMAGE_PROC class descriptor. +.. _v4l2-cid-link-freq: + ``V4L2_CID_LINK_FREQ (integer menu)`` Data bus frequency. Together with the media bus pixel code, bus type (clock cycles per sample), the data bus frequency defines the pixel --2.30.2
Sakari Ailus
maintainerRe: [PATCH 1/6] Documentation: media: Improve camera sensor documentation
Hi Jacopo,
Thanks for the review.
Quoted 174 lines · Jacopo Mondi
Hi Sakari,
thanks for addressing comments on v1just a few minros, the rest looks very good!
Quoted 168 lines · Sakari Ailus
Modernise the documentation to make it more precise and update the use of pixel rate control and various other changes. In particular:
- Use non-proportional font for file names, properties as well as controls.
- The unit of the HBLANK control is pixels, not lines.
- The unit of
PIXEL_RATEcontrol is pixels per second, not Hz.- Merge common requirements for CSI-2 and parallel busses.
- Include all DT properties needed for assigned clocks.
- Fix referencing the link rate control.
- SMIA driver's new name is CCS driver.
- The
PIXEL_RATEcontrol denotes pixel rate on the pixel array on camera sensors. Do not suggest it is used to tell the maximum pixel rate on the bus anymore.- Improve ReST syntax (plain struct and function names).
- Remove the suggestion to use
s_power()in receiver drivers.- Make MIPI website URL use HTTPS, add Wikipedia links to BT.601 and BT.656.
Fixes e4cf8c58af75 ("media: Documentation: media: Document how to write camera sensor drivers")Signed-off-by Sakari Ailus <[email protected]>--- .../driver-api/media/camera-sensor.rst | 45 +++---- Documentation/driver-api/media/index.rst | 2 +- .../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++++++------- .../media/v4l/ext-ctrls-image-process.rst | 2 + 4 files changed, 90 insertions(+), 73 deletions(-) rename Documentation/driver-api/media/{csi2.rst => tx-rx.rst} (39%)Documentation/driver-api/media/camera-sensor.rst +17
-28@@ -3,10 +3,10 @@ Writing camera sensor drivers ============================= -CSI-2 ------ +CSI-2 and parallel (BT.601 and BT.656) busses +--------------------------------------------- -Please see what is written on :ref:`MIPI_CSI_2`. +Please see :ref:`transmitter-receiver`. Handling clocks ---------------@@ -26,15 +26,16 @@ user. ACPI ~~~~ -Read the "clock-frequency" _DSD property to denote the frequency. The driver can -rely on this frequency being used. +Read the ``clock-frequency`` _DSD property to denote the frequency. The driver +can rely on this frequency being used. Devicetree ~~~~~~~~~~ -The currently preferred way to achieve this is using "assigned-clock-rates" -property. See Documentation/devicetree/bindings/clock/clock-bindings.txt for -more information. The driver then gets the frequency using clk_get_rate(). +The currently preferred way to achieve this is using ``assigned-clocks``, +``assigned-clock-parents`` and ``assigned-clock-rates`` properties. See +``Documentation/devicetree/bindings/clock/clock-bindings.txt`` for more +information. The driver then gets the frequency using ``clk_get_rate()``. This approach has the drawback that there's no guarantee that the frequency hasn't been modified directly or indirectly by another driver, or supported by@@ -55,7 +56,7 @@ processing pipeline as one or more sub-devices with different cropping and scaling configurations. The output size of the device is the result of a series of cropping and scaling operations from the device's pixel array's size. -An example of such a driver is the smiapp driver (see drivers/media/i2c/smiapp). +An example of such a driver is the CCS driver (see ``drivers/media/i2c/ccs``). Register list based drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~@@ -67,7 +68,7 @@ level are independent. How a driver picks such configuration is based on the format set on a source pad at the end of the device's internal pipeline. Most sensor drivers are implemented this way, see e.g. -drivers/media/i2c/imx319.c for an example. +``drivers/media/i2c/imx319.c`` for an example. Frame interval configuration ----------------------------@@ -94,9 +95,10 @@ large variety of devices beyond camera sensors. Devices that have no analogue crop, use the full source image size, i.e. pixel array size. Horizontal and vertical blanking are specified by ``V4L2_CID_HBLANK`` and -``V4L2_CID_VBLANK``, respectively. The unit of these controls are lines. The -pixel rate is specified by ``V4L2_CID_PIXEL_RATE`` in the same sub-device. The -unit of that control is Hz. +``V4L2_CID_VBLANK``, respectively. The unit of the ``V4L2_CID_HBLANK`` control +is pixels and the unit of the ``V4L2_CID_VBLANK`` is lines. The pixel rate in +the sensor's **pixel array** is specified by ``V4L2_CID_PIXEL_RATE`` in the same +sub-device. The unit of that control is pixels per second. Register list based drivers need to implement read-only sub-device nodes for the purpose. Devices that are not register list based need these to configure the@@ -125,14 +127,14 @@ general, the device must be powered on at least when its registers are being accessed and when it is streaming. Existing camera sensor drivers may rely on the old -:c:type:`v4l2_subdev_core_ops`->s_power() callback for bridge or ISP drivers to +struct v4l2_subdev_core_ops->s_power() callback for bridge or ISP drivers to manage their power state. This is however **deprecated**. If you feel you need to begin calling an s_power from an ISP or a bridge driver, instead please add runtime PM support to the sensor driver you are using. Likewise, new drivers should not use s_power. Please see examples in e.g. ``drivers/media/i2c/ov8856.c`` and -``drivers/media/i2c/smiapp/smiapp-core.c``. The two drivers work in both ACPI +``drivers/media/i2c/ccs/ccs-core.c``. The two drivers work in both ACPI and DT based systems. Control framework@@ -149,16 +151,3 @@ used to obtain device's power state after the power state transition: The function returns a non-zero value if it succeeded getting the power count or runtime PM was disabled, in either of which cases the driver may proceed to access the device. - -Controls --------- - -For camera sensors that are connected to a bus where transmitter and receiver -require common configuration set by drivers, such as CSI-2 or parallel (BT.601 -or BT.656) bus, the ``V4L2_CID_LINK_FREQ`` control is mandatory on transmitter -drivers. Receiver drivers can use the ``V4L2_CID_LINK_FREQ`` to query the -frequency used on the bus. - -The transmitter drivers should also implement ``V4L2_CID_PIXEL_RATE`` control in -order to tell the maximum pixel rate to the receiver. This is required on raw -camera sensors.Documentation/driver-api/media/index.rst +1
-1@@ -37,7 +37,7 @@ Documentation/userspace-api/media/index.rst rc-core mc-core cec-core - csi2 + tx-rx camera-sensor drivers/indexDocumentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +0
-0@@ -1,39 +1,71 @@ .. SPDX-License-Identifier: GPL-2.0
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst line 8
Quoted 7 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +6
-1-.. _MIPI_CSI_2: +.. _transmitter-receiver: + +Pixel data transmitter and receiver drivers +=========================================== + +V4L2 supports various devices that transmit and receiver pixel data. Examples ofs/and receiver/and receives/
"receive"; it's plural. :-)
Quoted 49 lines
Quoted 49 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-13+these devices include a camera sensor, a TV tuner and a parallel or a CSI-2 +receiver in an SoC. + +Bus types +--------- + +The following busses are the most common. This section discusses these two only. MIPI CSI-2 -========== +^^^^^^^^^^ CSI-2 is a data bus intended for transferring images from cameras to the host SoC. It is defined by the `MIPI alliance`_. -.. _`MIPI alliance`: http://www.mipi.org/ +.. _`MIPI alliance`: https://www.mipi.org/ -Media bus formats ------------------ +Parallel +^^^^^^^^ -See :ref:`v4l2-mbus-pixelcode` for details on which media bus formats should -be used for CSI-2 interfaces. +`BT.601`_ and `BT.656`_ are the most common parallel busses. + +.. _`BT.601`: https://en.wikipedia.org/wiki/Rec._601 +.. _`BT.656`: https://en.wikipedia.org/wiki/ITU-R_BT.656 Transmitter drivers ------------------- -CSI-2 transmitter, such as a sensor or a TV tuner, drivers need to -provide the CSI-2 receiver with information on the CSI-2 bus -configuration. These include the V4L2_CID_LINK_FREQ and -V4L2_CID_PIXEL_RATE controls and -(:c:type:`v4l2_subdev_video_ops`->s_stream() callback). These -interface elements must be present on the sub-device represents the -CSI-2 transmitter. +Transmitter drivers generally need to provide the receiver drivers with the +configuration of the transmitter. What is required depends on the type of the +bus. These are common for both busses. + +Media bus pixel code +^^^^^^^^^^^^^^^^^^^^ + +The media bus pixel codes document parallel formats. Should the pixel data be
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst line 45
Quoted 2 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +2
-0+transported over a serial bus, the media bus pixel code that describes a +parallel format that transfers a sample on a single clock cycle is used.I guess you intend to document that, in example,
MEDIA_BUS_FMT_YUYV8_2X8has to be used on parallel busses, as the bus width is meaningful, whileMEDIA_BUS_FMT_YUYV8_1X16should be used on serial busses as the bus width it's not. I guess this could be reported as an example ?
We actually have such an example in media bus pixel code documentation.
How about removing the paragraph and leaving just the reference below?
Quoted 50 lines
Quoted 50 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-8+ +See :ref:`v4l2-mbus-pixelcode`. + +Link frequency +^^^^^^^^^^^^^^ + +The :ref:`V4L2_CID_LINK_FREQ <v4l2-cid-link-freq>` control is used to tell the +receiver the frequency of the bus (i.e. it is not the same as the symbol rate). + +``.s_stream()`` callback +^^^^^^^^^^^^^^^^^^^^^^^^ -The V4L2_CID_LINK_FREQ control is used to tell the receiver driver the -frequency (and not the symbol rate) of the link. The V4L2_CID_PIXEL_RATE -control may be used by the receiver to obtain the pixel rate the transmitter -uses. The :c:type:`v4l2_subdev_video_ops`->s_stream() callback provides an -ability to start and stop the stream. +The struct struct v4l2_subdev_video_ops->s_stream() callback is used by the +receiver driver to control the transmitter driver's streaming state. -The value of the V4L2_CID_PIXEL_RATE is calculated as follows:: + +CSI-2 transmitter drivers +------------------------- + +Pixel rate +^^^^^^^^^^ + +The pixel rate on the bus is calculated as follows:: pixel_rate = link_freq * 2 * nr_of_lanes * 16 / k / bits_per_sample@@ -45,27 +77,38 @@ where * - variable or constant - description * - link_freq - - The value of the V4L2_CID_LINK_FREQ integer64 menu item. + - The value of the ``V4L2_CID_LINK_FREQ`` integer64 menu item. * - nr_of_lanes - Number of data lanes used on the CSI-2 link. This can be obtained from the OF endpoint configuration. * - 2 - - Two bits are transferred per clock cycle per lane. + - Data is transferred on both rising and falling edge of the signal. * - bits_per_sample - Number of bits per sample. * - k - 16 for D-PHY and 7 for C-PHY
Quoted 11 lines
Documentation/driver-api/media/tx-rx.rst where · line 94
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +4
-5-The transmitter drivers must, if possible, configure the CSI-2 -transmitter to *LP-11 mode* whenever the transmitter is powered on but -not active, and maintain *LP-11 mode* until stream on. Only at stream -on should the transmitter activate the clock on the clock lane and -transition to *HS mode*. +.. note:: + + The pixel rate calculated this way is **not** be the same thing than + the pixel rate on the camera sensor's pixel array... as reported by the
V4L2_CID_PIXEL_RATEcontrol.
Good point. I'll use "... which is reported by ...", to
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst where · line 99
Quoted 6 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +5
-0+ +LP-11 and LP-111 modes +^^^^^^^^^^^^^^^^^^^^^^ + +The transmitter drivers must, if possible, configure the CSI-2 transmitter tos/drivers/driver/
Or if you want to keep it plural drop "The" ?
It could be singular, and indefinite. I think this is better since it obviously applies to all such drivers.
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst where · line 102
Quoted 4 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-0+*LP-11 or LP-111 mode* whenever the transmitter is powered on but not active, +and maintain *LP-11 or LP-111 mode* until stream on. Only at stream on should +the transmitter activate the clock on the clock lane and transition to *HS"Only at stream on time the transmitter should"
Sounds better to me, but not being a native speaker I might very well be wrong :)
Agreed, I added "time".
Quoted 3 lines
All minors, thanks for clearing this up
Reviewed-by Jacopo Mondi <[email protected]>
Thank you!
Signature · 3 lines
Kind regards, Sakari Ailus
Andrey Konovalov
Reviewed-byRe: [PATCH 1/6] Documentation: media: Improve camera sensor documentation
Hi Sakari,
Thank you for this work.
And thank you Jacopo for the review.
Looks fine overall; just few minor things.
Quoted 189 lines · Sakari Ailus
Hi Jacopo,
Thanks for the review.
Quoted 174 lines · Jacopo Mondi
Hi Sakari,
thanks for addressing comments on v1just a few minros, the rest looks very good!
Quoted 168 lines · Sakari Ailus
Modernise the documentation to make it more precise and update the use of pixel rate control and various other changes. In particular:
- Use non-proportional font for file names, properties as well as controls.
- The unit of the HBLANK control is pixels, not lines.
- The unit of
PIXEL_RATEcontrol is pixels per second, not Hz.- Merge common requirements for CSI-2 and parallel busses.
- Include all DT properties needed for assigned clocks.
- Fix referencing the link rate control.
- SMIA driver's new name is CCS driver.
- The
PIXEL_RATEcontrol denotes pixel rate on the pixel array on camera sensors. Do not suggest it is used to tell the maximum pixel rate on the bus anymore.- Improve ReST syntax (plain struct and function names).
- Remove the suggestion to use
s_power()in receiver drivers.- Make MIPI website URL use HTTPS, add Wikipedia links to BT.601 and BT.656.
Fixes e4cf8c58af75 ("media: Documentation: media: Document how to write camera sensor drivers")Signed-off-by Sakari Ailus <[email protected]>--- .../driver-api/media/camera-sensor.rst | 45 +++---- Documentation/driver-api/media/index.rst | 2 +- .../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++++++------- .../media/v4l/ext-ctrls-image-process.rst | 2 + 4 files changed, 90 insertions(+), 73 deletions(-)rename
Documentation/driver-api/media/{csi2.rst=>tx-rx.rst} (39%)Documentation/driver-api/media/camera-sensor.rst +17
-28@@ -3,10 +3,10 @@ Writing camera sensor drivers ============================= -CSI-2 ------ +CSI-2 and parallel (BT.601 and BT.656) busses +--------------------------------------------- -Please see what is written on :ref:`MIPI_CSI_2`. +Please see :ref:`transmitter-receiver`. Handling clocks ---------------@@ -26,15 +26,16 @@ user. ACPI ~~~~ -Read the "clock-frequency" _DSD property to denote the frequency. The driver can -rely on this frequency being used. +Read the ``clock-frequency`` _DSD property to denote the frequency. The driver +can rely on this frequency being used. Devicetree ~~~~~~~~~~ -The currently preferred way to achieve this is using "assigned-clock-rates" -property. See Documentation/devicetree/bindings/clock/clock-bindings.txt for -more information. The driver then gets the frequency using clk_get_rate(). +The currently preferred way to achieve this is using ``assigned-clocks``, +``assigned-clock-parents`` and ``assigned-clock-rates`` properties. See +``Documentation/devicetree/bindings/clock/clock-bindings.txt`` for more +information. The driver then gets the frequency using ``clk_get_rate()``. This approach has the drawback that there's no guarantee that the frequency hasn't been modified directly or indirectly by another driver, or supported by@@ -55,7 +56,7 @@ processing pipeline as one or more sub-devices with different cropping and scaling configurations. The output size of the device is the result of a series of cropping and scaling operations from the device's pixel array's size. -An example of such a driver is the smiapp driver (see drivers/media/i2c/smiapp). +An example of such a driver is the CCS driver (see ``drivers/media/i2c/ccs``). Register list based drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~@@ -67,7 +68,7 @@ level are independent. How a driver picks such configuration is based on the format set on a source pad at the end of the device's internal pipeline. Most sensor drivers are implemented this way, see e.g. -drivers/media/i2c/imx319.c for an example. +``drivers/media/i2c/imx319.c`` for an example. Frame interval configuration ----------------------------@@ -94,9 +95,10 @@ large variety of devices beyond camera sensors. Devices that have no analogue crop, use the full source image size, i.e. pixel array size. Horizontal and vertical blanking are specified by ``V4L2_CID_HBLANK`` and -``V4L2_CID_VBLANK``, respectively. The unit of these controls are lines. The -pixel rate is specified by ``V4L2_CID_PIXEL_RATE`` in the same sub-device. The -unit of that control is Hz. +``V4L2_CID_VBLANK``, respectively. The unit of the ``V4L2_CID_HBLANK`` control +is pixels and the unit of the ``V4L2_CID_VBLANK`` is lines. The pixel rate in +the sensor's **pixel array** is specified by ``V4L2_CID_PIXEL_RATE`` in the same +sub-device. The unit of that control is pixels per second. Register list based drivers need to implement read-only sub-device nodes for the purpose. Devices that are not register list based need these to configure the@@ -125,14 +127,14 @@ general, the device must be powered on at least when its registers are being accessed and when it is streaming. Existing camera sensor drivers may rely on the old -:c:type:`v4l2_subdev_core_ops`->s_power() callback for bridge or ISP drivers to +struct v4l2_subdev_core_ops->s_power() callback for bridge or ISP drivers to manage their power state. This is however **deprecated**. If you feel you need to begin calling an s_power from an ISP or a bridge driver, instead please add runtime PM support to the sensor driver you are using. Likewise, new drivers should not use s_power. Please see examples in e.g. ``drivers/media/i2c/ov8856.c`` and -``drivers/media/i2c/smiapp/smiapp-core.c``. The two drivers work in both ACPI +``drivers/media/i2c/ccs/ccs-core.c``. The two drivers work in both ACPI and DT based systems. Control framework@@ -149,16 +151,3 @@ used to obtain device's power state after the power state transition: The function returns a non-zero value if it succeeded getting the power count or runtime PM was disabled, in either of which cases the driver may proceed to access the device. - -Controls --------- - -For camera sensors that are connected to a bus where transmitter and receiver -require common configuration set by drivers, such as CSI-2 or parallel (BT.601 -or BT.656) bus, the ``V4L2_CID_LINK_FREQ`` control is mandatory on transmitter -drivers. Receiver drivers can use the ``V4L2_CID_LINK_FREQ`` to query the -frequency used on the bus. - -The transmitter drivers should also implement ``V4L2_CID_PIXEL_RATE`` control in -order to tell the maximum pixel rate to the receiver. This is required on raw -camera sensors.Documentation/driver-api/media/index.rst +1
-1@@ -37,7 +37,7 @@ Documentation/userspace-api/media/index.rst rc-core mc-core cec-core - csi2 + tx-rx camera-sensor drivers/indexDocumentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +0
-0@@ -1,39 +1,71 @@ .. SPDX-License-Identifier: GPL-2.0Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst line 8
Quoted 7 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +6
-1-.. _MIPI_CSI_2: +.. _transmitter-receiver: + +Pixel data transmitter and receiver drivers +=========================================== + +V4L2 supports various devices that transmit and receiver pixel data. Examples ofs/and receiver/and receives/
Quoted 1 line
"receive"; it's plural. :-)
Correct
Quoted 49 lines
Quoted 49 lines
Quoted 49 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-13+these devices include a camera sensor, a TV tuner and a parallel or a CSI-2 +receiver in an SoC. + +Bus types +--------- + +The following busses are the most common. This section discusses these two only. MIPI CSI-2 -========== +^^^^^^^^^^ CSI-2 is a data bus intended for transferring images from cameras to the host SoC. It is defined by the `MIPI alliance`_. -.. _`MIPI alliance`: http://www.mipi.org/ +.. _`MIPI alliance`: https://www.mipi.org/ -Media bus formats ------------------ +Parallel +^^^^^^^^ -See :ref:`v4l2-mbus-pixelcode` for details on which media bus formats should -be used for CSI-2 interfaces. +`BT.601`_ and `BT.656`_ are the most common parallel busses. + +.. _`BT.601`: https://en.wikipedia.org/wiki/Rec._601 +.. _`BT.656`: https://en.wikipedia.org/wiki/ITU-R_BT.656 Transmitter drivers ------------------- -CSI-2 transmitter, such as a sensor or a TV tuner, drivers need to -provide the CSI-2 receiver with information on the CSI-2 bus -configuration. These include the V4L2_CID_LINK_FREQ and -V4L2_CID_PIXEL_RATE controls and -(:c:type:`v4l2_subdev_video_ops`->s_stream() callback). These -interface elements must be present on the sub-device represents the -CSI-2 transmitter. +Transmitter drivers generally need to provide the receiver drivers with the +configuration of the transmitter. What is required depends on the type of the +bus. These are common for both busses. + +Media bus pixel code +^^^^^^^^^^^^^^^^^^^^ + +The media bus pixel codes document parallel formats. Should the pixel data be
Quoted 8 lines
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst line 45
Quoted 2 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +2
-0+transported over a serial bus, the media bus pixel code that describes a +parallel format that transfers a sample on a single clock cycle is used.I guess you intend to document that, in example,
MEDIA_BUS_FMT_YUYV8_2X8has to be used on parallel busses, as the bus width is meaningful, whileMEDIA_BUS_FMT_YUYV8_1X16should be used on serial busses as the bus width it's not. I guess this could be reported as an example ?
Looks like a good idea for me.
Quoted 3 lines
We actually have such an example in media bus pixel code documentation.
How about removing the paragraph and leaving just the reference below?
The reference would work for me.
Quoted 50 lines
Quoted 50 lines
Quoted 50 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-8+ +See :ref:`v4l2-mbus-pixelcode`. + +Link frequency +^^^^^^^^^^^^^^ + +The :ref:`V4L2_CID_LINK_FREQ <v4l2-cid-link-freq>` control is used to tell the +receiver the frequency of the bus (i.e. it is not the same as the symbol rate). + +``.s_stream()`` callback +^^^^^^^^^^^^^^^^^^^^^^^^ -The V4L2_CID_LINK_FREQ control is used to tell the receiver driver the -frequency (and not the symbol rate) of the link. The V4L2_CID_PIXEL_RATE -control may be used by the receiver to obtain the pixel rate the transmitter -uses. The :c:type:`v4l2_subdev_video_ops`->s_stream() callback provides an -ability to start and stop the stream. +The struct struct v4l2_subdev_video_ops->s_stream() callback is used by the +receiver driver to control the transmitter driver's streaming state. -The value of the V4L2_CID_PIXEL_RATE is calculated as follows:: + +CSI-2 transmitter drivers +------------------------- + +Pixel rate +^^^^^^^^^^ + +The pixel rate on the bus is calculated as follows:: pixel_rate = link_freq * 2 * nr_of_lanes * 16 / k / bits_per_sample@@ -45,27 +77,38 @@ where * - variable or constant - description * - link_freq - - The value of the V4L2_CID_LINK_FREQ integer64 menu item. + - The value of the ``V4L2_CID_LINK_FREQ`` integer64 menu item. * - nr_of_lanes - Number of data lanes used on the CSI-2 link. This can be obtained from the OF endpoint configuration. * - 2 - - Two bits are transferred per clock cycle per lane. + - Data is transferred on both rising and falling edge of the signal. * - bits_per_sample - Number of bits per sample. * - k - 16 for D-PHY and 7 for C-PHY
Quoted 8 lines
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst where · line 93
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-5-The transmitter drivers must, if possible, configure the CSI-2 -transmitter to *LP-11 mode* whenever the transmitter is powered on but -not active, and maintain *LP-11 mode* until stream on. Only at stream -on should the transmitter activate the clock on the clock lane and -transition to *HS mode*. +.. note:: + + The pixel rate calculated this way is **not** be the same thing than
s/is **not** be the same thing/is **not** the same thing/
Also maybe s/than/as ("not the same thing as"), but this is up to you.
Quoted 16 lines
Quoted 3 lines
Documentation/driver-api/media/tx-rx.rst where · line 94
Quoted 1 line
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +1
-0+ the pixel rate on the camera sensor's pixel array... as reported by the
V4L2_CID_PIXEL_RATEcontrol.Good point. I'll use "... which is reported by ...", to
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst where · line 99
Quoted 6 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +5
-0+ +LP-11 and LP-111 modes +^^^^^^^^^^^^^^^^^^^^^^ + +The transmitter drivers must, if possible, configure the CSI-2 transmitter tos/drivers/driver/
Or if you want to keep it plural drop "The" ?
Quoted 2 lines
It could be singular, and indefinite. I think this is better since it obviously applies to all such drivers.
I am for the original "The transmitter drivers" or even "All the transmitter drivers"
Quoted 7 lines
Quoted 7 lines
Documentation/driver-api/media/tx-rx.rst where · line 102
Quoted 4 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-0+*LP-11 or LP-111 mode* whenever the transmitter is powered on but not active, +and maintain *LP-11 or LP-111 mode* until stream on. Only at stream on should +the transmitter activate the clock on the clock lane and transition to *HS"Only at stream on time the transmitter should"
Quoted 8 lines
Quoted 2 lines
Sounds better to me, but not being a native speaker I might very well be wrong :)
Agreed, I added "time".
Quoted 3 lines
All minors, thanks for clearing this up
Reviewed-by Jacopo Mondi <[email protected]>
Thanks,
Andrey
Quoted 2 lines
Thank you!
Sakari Ailus
maintainerRe: [PATCH 1/6] Documentation: media: Improve camera sensor documentation
Hi Andrey,
Thanks for the review.
Quoted 259 lines · Andrey Konovalov
Hi Sakari,
Thank you for this work.
And thank you Jacopo for the review.Looks fine overall; just few minor things.
Quoted 189 lines · Sakari Ailus
Hi Jacopo,
Thanks for the review.
Quoted 174 lines · Jacopo Mondi
Hi Sakari,
thanks for addressing comments on v1just a few minros, the rest looks very good!
Quoted 168 lines · Sakari Ailus
Modernise the documentation to make it more precise and update the use of pixel rate control and various other changes. In particular:
- Use non-proportional font for file names, properties as well as controls.
- The unit of the HBLANK control is pixels, not lines.
- The unit of
PIXEL_RATEcontrol is pixels per second, not Hz.- Merge common requirements for CSI-2 and parallel busses.
- Include all DT properties needed for assigned clocks.
- Fix referencing the link rate control.
- SMIA driver's new name is CCS driver.
- The
PIXEL_RATEcontrol denotes pixel rate on the pixel array on camera sensors. Do not suggest it is used to tell the maximum pixel rate on the bus anymore.- Improve ReST syntax (plain struct and function names).
- Remove the suggestion to use
s_power()in receiver drivers.- Make MIPI website URL use HTTPS, add Wikipedia links to BT.601 and BT.656.
Fixes e4cf8c58af75 ("media: Documentation: media: Document how to write camera sensor drivers")Signed-off-by Sakari Ailus <[email protected]>--- .../driver-api/media/camera-sensor.rst | 45 +++---- Documentation/driver-api/media/index.rst | 2 +- .../driver-api/media/{csi2.rst => tx-rx.rst} | 114 +++++++++++------- .../media/v4l/ext-ctrls-image-process.rst | 2 + 4 files changed, 90 insertions(+), 73 deletions(-)rename
Documentation/driver-api/media/{csi2.rst=>tx-rx.rst} (39%)Documentation/driver-api/media/camera-sensor.rst +17
-28@@ -3,10 +3,10 @@ Writing camera sensor drivers ============================= -CSI-2 ------ +CSI-2 and parallel (BT.601 and BT.656) busses +--------------------------------------------- -Please see what is written on :ref:`MIPI_CSI_2`. +Please see :ref:`transmitter-receiver`. Handling clocks ---------------@@ -26,15 +26,16 @@ user. ACPI ~~~~ -Read the "clock-frequency" _DSD property to denote the frequency. The driver can -rely on this frequency being used. +Read the ``clock-frequency`` _DSD property to denote the frequency. The driver +can rely on this frequency being used. Devicetree ~~~~~~~~~~ -The currently preferred way to achieve this is using "assigned-clock-rates" -property. See Documentation/devicetree/bindings/clock/clock-bindings.txt for -more information. The driver then gets the frequency using clk_get_rate(). +The currently preferred way to achieve this is using ``assigned-clocks``, +``assigned-clock-parents`` and ``assigned-clock-rates`` properties. See +``Documentation/devicetree/bindings/clock/clock-bindings.txt`` for more +information. The driver then gets the frequency using ``clk_get_rate()``. This approach has the drawback that there's no guarantee that the frequency hasn't been modified directly or indirectly by another driver, or supported by@@ -55,7 +56,7 @@ processing pipeline as one or more sub-devices with different cropping and scaling configurations. The output size of the device is the result of a series of cropping and scaling operations from the device's pixel array's size. -An example of such a driver is the smiapp driver (see drivers/media/i2c/smiapp). +An example of such a driver is the CCS driver (see ``drivers/media/i2c/ccs``). Register list based drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~@@ -67,7 +68,7 @@ level are independent. How a driver picks such configuration is based on the format set on a source pad at the end of the device's internal pipeline. Most sensor drivers are implemented this way, see e.g. -drivers/media/i2c/imx319.c for an example. +``drivers/media/i2c/imx319.c`` for an example. Frame interval configuration ----------------------------@@ -94,9 +95,10 @@ large variety of devices beyond camera sensors. Devices that have no analogue crop, use the full source image size, i.e. pixel array size. Horizontal and vertical blanking are specified by ``V4L2_CID_HBLANK`` and -``V4L2_CID_VBLANK``, respectively. The unit of these controls are lines. The -pixel rate is specified by ``V4L2_CID_PIXEL_RATE`` in the same sub-device. The -unit of that control is Hz. +``V4L2_CID_VBLANK``, respectively. The unit of the ``V4L2_CID_HBLANK`` control +is pixels and the unit of the ``V4L2_CID_VBLANK`` is lines. The pixel rate in +the sensor's **pixel array** is specified by ``V4L2_CID_PIXEL_RATE`` in the same +sub-device. The unit of that control is pixels per second. Register list based drivers need to implement read-only sub-device nodes for the purpose. Devices that are not register list based need these to configure the@@ -125,14 +127,14 @@ general, the device must be powered on at least when its registers are being accessed and when it is streaming. Existing camera sensor drivers may rely on the old -:c:type:`v4l2_subdev_core_ops`->s_power() callback for bridge or ISP drivers to +struct v4l2_subdev_core_ops->s_power() callback for bridge or ISP drivers to manage their power state. This is however **deprecated**. If you feel you need to begin calling an s_power from an ISP or a bridge driver, instead please add runtime PM support to the sensor driver you are using. Likewise, new drivers should not use s_power. Please see examples in e.g. ``drivers/media/i2c/ov8856.c`` and -``drivers/media/i2c/smiapp/smiapp-core.c``. The two drivers work in both ACPI +``drivers/media/i2c/ccs/ccs-core.c``. The two drivers work in both ACPI and DT based systems. Control framework@@ -149,16 +151,3 @@ used to obtain device's power state after the power state transition: The function returns a non-zero value if it succeeded getting the power count or runtime PM was disabled, in either of which cases the driver may proceed to access the device. - -Controls --------- - -For camera sensors that are connected to a bus where transmitter and receiver -require common configuration set by drivers, such as CSI-2 or parallel (BT.601 -or BT.656) bus, the ``V4L2_CID_LINK_FREQ`` control is mandatory on transmitter -drivers. Receiver drivers can use the ``V4L2_CID_LINK_FREQ`` to query the -frequency used on the bus. - -The transmitter drivers should also implement ``V4L2_CID_PIXEL_RATE`` control in -order to tell the maximum pixel rate to the receiver. This is required on raw -camera sensors.Documentation/driver-api/media/index.rst +1
-1@@ -37,7 +37,7 @@ Documentation/userspace-api/media/index.rst rc-core mc-core cec-core - csi2 + tx-rx camera-sensor drivers/indexDocumentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +0
-0@@ -1,39 +1,71 @@ .. SPDX-License-Identifier: GPL-2.0Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst line 8
Quoted 7 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +6
-1-.. _MIPI_CSI_2: +.. _transmitter-receiver: + +Pixel data transmitter and receiver drivers +=========================================== + +V4L2 supports various devices that transmit and receiver pixel data. Examples ofs/and receiver/and receives/
Quoted 1 line
"receive"; it's plural. :-)
Correct
Quoted 49 lines
Quoted 49 lines
Quoted 49 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-13+these devices include a camera sensor, a TV tuner and a parallel or a CSI-2 +receiver in an SoC. + +Bus types +--------- + +The following busses are the most common. This section discusses these two only. MIPI CSI-2 -========== +^^^^^^^^^^ CSI-2 is a data bus intended for transferring images from cameras to the host SoC. It is defined by the `MIPI alliance`_. -.. _`MIPI alliance`: http://www.mipi.org/ +.. _`MIPI alliance`: https://www.mipi.org/ -Media bus formats ------------------ +Parallel +^^^^^^^^ -See :ref:`v4l2-mbus-pixelcode` for details on which media bus formats should -be used for CSI-2 interfaces. +`BT.601`_ and `BT.656`_ are the most common parallel busses. + +.. _`BT.601`: https://en.wikipedia.org/wiki/Rec._601 +.. _`BT.656`: https://en.wikipedia.org/wiki/ITU-R_BT.656 Transmitter drivers ------------------- -CSI-2 transmitter, such as a sensor or a TV tuner, drivers need to -provide the CSI-2 receiver with information on the CSI-2 bus -configuration. These include the V4L2_CID_LINK_FREQ and -V4L2_CID_PIXEL_RATE controls and -(:c:type:`v4l2_subdev_video_ops`->s_stream() callback). These -interface elements must be present on the sub-device represents the -CSI-2 transmitter. +Transmitter drivers generally need to provide the receiver drivers with the +configuration of the transmitter. What is required depends on the type of the +bus. These are common for both busses. + +Media bus pixel code +^^^^^^^^^^^^^^^^^^^^ + +The media bus pixel codes document parallel formats. Should the pixel data beQuoted 8 lines
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst line 45
Quoted 2 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +2
-0+transported over a serial bus, the media bus pixel code that describes a +parallel format that transfers a sample on a single clock cycle is used.I guess you intend to document that, in example,
MEDIA_BUS_FMT_YUYV8_2X8has to be used on parallel busses, as the bus width is meaningful, whileMEDIA_BUS_FMT_YUYV8_1X16should be used on serial busses as the bus width it's not. I guess this could be reported as an example ?
Quoted 7 lines
Looks like a good idea for me.
Quoted 3 lines
We actually have such an example in media bus pixel code documentation.
How about removing the paragraph and leaving just the reference below?
The reference would work for me.
Left the reference only.
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +23
-8+ +See :ref:`v4l2-mbus-pixelcode`. + +Link frequency +^^^^^^^^^^^^^^ + +The :ref:`V4L2_CID_LINK_FREQ <v4l2-cid-link-freq>` control is used to tell the +receiver the frequency of the bus (i.e. it is not the same as the symbol rate). + +``.s_stream()`` callback +^^^^^^^^^^^^^^^^^^^^^^^^ -The V4L2_CID_LINK_FREQ control is used to tell the receiver driver the -frequency (and not the symbol rate) of the link. The V4L2_CID_PIXEL_RATE -control may be used by the receiver to obtain the pixel rate the transmitter -uses. The :c:type:`v4l2_subdev_video_ops`->s_stream() callback provides an -ability to start and stop the stream. +The struct struct v4l2_subdev_video_ops->s_stream() callback is used by the +receiver driver to control the transmitter driver's streaming state. -The value of the V4L2_CID_PIXEL_RATE is calculated as follows:: + +CSI-2 transmitter drivers +------------------------- + +Pixel rate +^^^^^^^^^^ + +The pixel rate on the bus is calculated as follows:: pixel_rate = link_freq * 2 * nr_of_lanes * 16 / k / bits_per_sample@@ -45,27 +77,38 @@ where * - variable or constant - description * - link_freq - - The value of the V4L2_CID_LINK_FREQ integer64 menu item. + - The value of the ``V4L2_CID_LINK_FREQ`` integer64 menu item. * - nr_of_lanes - Number of data lanes used on the CSI-2 link. This can be obtained from the OF endpoint configuration. * - 2 - - Two bits are transferred per clock cycle per lane. + - Data is transferred on both rising and falling edge of the signal. * - bits_per_sample - Number of bits per sample. * - k - 16 for D-PHY and 7 for C-PHY
Quoted 10 lines
Quoted 8 lines
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst where · line 93
Quoted 8 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-5-The transmitter drivers must, if possible, configure the CSI-2 -transmitter to *LP-11 mode* whenever the transmitter is powered on but -not active, and maintain *LP-11 mode* until stream on. Only at stream -on should the transmitter activate the clock on the clock lane and -transition to *HS mode*. +.. note:: + + The pixel rate calculated this way is **not** be the same thing thans/is **not** be the same thing/is **not** the same thing/
Oops!
Quoted 2 lines
Also maybe s/than/as ("not the same thing as"), but this is up to you.
This is correct indeed. Fixed both.
Quoted 17 lines
Quoted 17 lines
Quoted 4 lines
Documentation/driver-api/media/tx-rx.rst where · line 94
Quoted 2 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +1
-0+ the pixel rate on the camera sensor's pixel array... as reported by the
V4L2_CID_PIXEL_RATEcontrol.Good point. I'll use "... which is reported by ...", to
Quoted 9 lines
Documentation/driver-api/media/tx-rx.rst where · line 99
Quoted 6 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +5
-0+ +LP-11 and LP-111 modes +^^^^^^^^^^^^^^^^^^^^^^ + +The transmitter drivers must, if possible, configure the CSI-2 transmitter tos/drivers/driver/
Or if you want to keep it plural drop "The" ?
Quoted 4 lines
Quoted 2 lines
It could be singular, and indefinite. I think this is better since it obviously applies to all such drivers.
I am for the original "The transmitter drivers" or even "All the transmitter drivers"
I kept the original.
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Documentation/driver-api/media/tx-rx.rst where · line 102
Quoted 5 lines
Documentation/driver-api/media/tx-rx.rst renamed from Documentation/driver-api/media/csi2.rst +3
-0+*LP-11 or LP-111 mode* whenever the transmitter is powered on but not active, +and maintain *LP-11 or LP-111 mode* until stream on. Only at stream on should +the transmitter activate the clock on the clock lane and transition to *HS"Only at stream on time the transmitter should"
Sounds better to me, but not being a native speaker I might very well be wrong :)
Quoted 7 lines
Quoted 5 lines
Agreed, I added "time".
Quoted 3 lines
All minors, thanks for clearing this up
Reviewed-by Jacopo Mondi <[email protected]>Reviewed-by Andrey Konovalov <[email protected]>
Thanks!
I'll send v3 soon. There was also a typo in the third patch (why wait for compile testing?) that I'll also fix with that.
Signature · 3 lines
Kind regards, Sakari Ailus
Sakari Ailus
maintainerPATCH 2/6 Documentation: media: Fix v4l2-async kerneldoc syntax
In reply to Sakari AilusFix kerneldoc syntax in v4l2-async. The references were not produced correctly.
--- include/media/v4l2-async.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
include/media/v4l2-async.h +15 -15
@@ -129,11 +129,11 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);* * This function initializes the notifier @asd_list. It must be called * before adding a subdevice to a notifier, using one of: -* @v4l2_async_notifier_add_fwnode_remote_subdev, -* @v4l2_async_notifier_add_fwnode_subdev, -* @v4l2_async_notifier_add_i2c_subdev, -* @__v4l2_async_notifier_add_subdev or -* @v4l2_async_notifier_parse_fwnode_endpoints. +* v4l2_async_notifier_add_fwnode_remote_subdev(), +* v4l2_async_notifier_add_fwnode_subdev(), +* v4l2_async_notifier_add_i2c_subdev(), +* __v4l2_async_notifier_add_subdev() or +* v4l2_async_notifier_parse_fwnode_endpoints(). */ void v4l2_async_notifier_init (struct v4l2_async_notifier *notifier);
@@ -145,9 +145,9 @@ void v4l2_async_notifier_init(struct v4l2_async_notifier *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. +* 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
@@ -200,7 +200,7 @@ __v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif* function also gets a reference of the fwnode which is released later at * notifier cleanup time. * -* This is just like @v4l2_async_notifier_add_fwnode_subdev, but with the +* 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. */ #define v4l2_async_notifier_add_fwnode_remote_subdev (notifier, ep, type) \
@@ -265,13 +265,13 @@ 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_fwnode_remote_subdev, -* @v4l2_async_notifier_add_fwnode_subdev, -* @v4l2_async_notifier_add_i2c_subdev, -* @__v4l2_async_notifier_add_subdev or -* @v4l2_async_notifier_parse_fwnode_endpoints. +* v4l2_async_notifier_add_fwnode_remote_subdev(), +* v4l2_async_notifier_add_fwnode_subdev(), +* v4l2_async_notifier_add_i2c_subdev(), +* __v4l2_async_notifier_add_subdev() or +* v4l2_async_notifier_parse_fwnode_endpoints(). * -* There is no harm from calling v4l2_async_notifier_cleanup in other +* 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 * allocated. */
Signature · 1 line
2.30.2
Re: [PATCH 2/6] Documentation: media: Fix v4l2-async kerneldoc syntax
Hi Sakari,
Quoted 4 lines · Sakari Ailus
Fix kerneldoc syntax in v4l2-async. The references were not produced correctly.
Signed-off-by Sakari Ailus <[email protected]>
Thanks
j
Quoted 70 lines
--- include/media/v4l2-async.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)include/media/v4l2-async.h +15
-16@@ -129,11 +129,11 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir);* * This function initializes the notifier @asd_list. It must be called * before adding a subdevice to a notifier, using one of: -* @v4l2_async_notifier_add_fwnode_remote_subdev, -* @v4l2_async_notifier_add_fwnode_subdev, -* @v4l2_async_notifier_add_i2c_subdev, -* @__v4l2_async_notifier_add_subdev or -* @v4l2_async_notifier_parse_fwnode_endpoints. +* v4l2_async_notifier_add_fwnode_remote_subdev(), +* v4l2_async_notifier_add_fwnode_subdev(), +* v4l2_async_notifier_add_i2c_subdev(), +* __v4l2_async_notifier_add_subdev() or +* v4l2_async_notifier_parse_fwnode_endpoints(). */ void v4l2_async_notifier_init (struct v4l2_async_notifier *notifier);@@ -145,9 +145,9 @@ void v4l2_async_notifier_init(struct v4l2_async_notifier *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. +* 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 @@ -200,7 +200,7 @@ __v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif* function also gets a reference of the fwnode which is released later at * notifier cleanup time. * -* This is just like @v4l2_async_notifier_add_fwnode_subdev, but with the +* 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. */ #define v4l2_async_notifier_add_fwnode_remote_subdev (notifier, ep, type) \@@ -265,13 +265,13 @@ 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_fwnode_remote_subdev, -* @v4l2_async_notifier_add_fwnode_subdev, -* @v4l2_async_notifier_add_i2c_subdev, -* @__v4l2_async_notifier_add_subdev or -* @v4l2_async_notifier_parse_fwnode_endpoints. +* v4l2_async_notifier_add_fwnode_remote_subdev(), +* v4l2_async_notifier_add_fwnode_subdev(), +* v4l2_async_notifier_add_i2c_subdev(), +* __v4l2_async_notifier_add_subdev() or +* v4l2_async_notifier_parse_fwnode_endpoints(). * -* There is no harm from calling v4l2_async_notifier_cleanup in other +* 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 * allocated. */ --2.30.2
Sakari Ailus
maintainerPATCH 3/6 v4l: async: Rename async nf functions, clean up long lines
In reply to Sakari AilusRename V4L2 async notifier functions, replacing "notifier" with "nf" and removing "_subdev" at the end of the function names adding subdevs as you can only add subdevs to a notifier. Also wrap and otherwise clean up long lines.
--- .../driver-api/media/v4l2-subdev.rst | 14 +- drivers/media/i2c/max9286.c | 17 +- drivers/media/i2c/st-mipid02.c | 22 ++- drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 17 +- drivers/media/platform/am437x/am437x-vpfe.c | 19 +- drivers/media/platform/atmel/atmel-isc-base.c | 4 +- drivers/media/platform/atmel/atmel-isi.c | 17 +- .../media/platform/atmel/atmel-sama5d2-isc.c | 15 +- .../media/platform/atmel/atmel-sama7g5-isc.c | 8 +- drivers/media/platform/cadence/cdns-csi2rx.c | 14 +- drivers/media/platform/davinci/vpif_capture.c | 21 +-- drivers/media/platform/exynos4-is/media-dev.c | 20 +-- .../media/platform/marvell-ccic/cafe-driver.c | 9 +- .../media/platform/marvell-ccic/mcam-core.c | 10 +- .../media/platform/marvell-ccic/mmp-driver.c | 6 +- drivers/media/platform/omap3isp/isp.c | 21 ++- drivers/media/platform/pxa_camera.c | 26 ++- drivers/media/platform/qcom/camss/camss.c | 18 +- drivers/media/platform/rcar-vin/rcar-core.c | 34 ++-- drivers/media/platform/rcar-vin/rcar-csi2.c | 19 +- drivers/media/platform/rcar_drif.c | 14 +- drivers/media/platform/renesas-ceu.c | 29 ++- .../platform/rockchip/rkisp1/rkisp1-dev.c | 17 +- drivers/media/platform/stm32/stm32-dcmi.c | 18 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 12 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 19 +- drivers/media/platform/ti-vpe/cal.c | 16 +- drivers/media/platform/video-mux.c | 17 +- drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- drivers/media/v4l2-core/v4l2-async.c | 168 +++++++++--------- drivers/media/v4l2-core/v4l2-fwnode.c | 74 ++++---- drivers/staging/media/imx/imx-media-csi.c | 17 +- .../staging/media/imx/imx-media-dev-common.c | 7 +- drivers/staging/media/imx/imx-media-dev.c | 6 +- drivers/staging/media/imx/imx-media-of.c | 6 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +- drivers/staging/media/imx/imx7-media-csi.c | 24 +-- drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- drivers/staging/media/tegra-video/vi.c | 17 +- include/media/v4l2-async.h | 105 ++++++----- include/media/v4l2-fwnode.h | 12 +- 41 files changed, 469 insertions(+), 490 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +7 -7
@@ -191,21 +191,21 @@ registered this way are stored in a global list of subdevices, ready to be picked up by bridge drivers. Bridge drivers in turn have to register a notifier object. This is -performed using the :c:func:`v4l2_async_notifier_register` call. To +performed using the :c:func:`v4l2_async_nf_register` call. To unregister the notifier the driver has to call -:c:func:`v4l2_async_notifier_unregister`. The former of the two functions +:c:func:`v4l2_async_nf_unregister`. The former of the two functions takes two arguments: a pointer to struct :c:type:`v4l2_device` and a pointer to struct :c:type:`v4l2_async_notifier`. Before registering the notifier, bridge drivers must do two things: first, the -notifier must be initialized using the :c:func:`v4l2_async_notifier_init`. +notifier must be initialized using the :c:func:`v4l2_async_nf_init`. Second, bridge drivers can then begin to form a list of subdevice descriptors that the bridge device needs for its operation. Several functions are available to add subdevice descriptors to a notifier, depending on the type of device and the needs of the driver. -:c:func:`v4l2_async_notifier_add_fwnode_remote_subdev` and -:c:func:`v4l2_async_notifier_add_i2c_subdev` are for bridge and ISP drivers for +:c:func:`v4l2_async_nf_add_fwnode_remote` and +:c:func:`v4l2_async_nf_add_i2c` are for bridge and ISP drivers for registering their async sub-devices with the notifier. :c:func:`v4l2_async_register_subdev_sensor` is a helper function for
@@ -230,8 +230,8 @@ These functions allocate an async sub-device descriptor which is of type struct ... - my_asd = v4l2_async_notifier_add_fwnode_remote_subdev(¬ifier, ep, - struct my_async_subdev); + my_asd = v4l2_async_nf_add_fwnode_remote(¬ifier, ep, + struct my_async_subdev); fwnode_handle_put(ep); if (IS_ERR(asd))
drivers/media/i2c/max9286.c +8 -9
@@ -606,19 +606,18 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)if (!priv->nsources)return 0 ; -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier);for_each_source (priv, source) {unsigned int i =to_index (priv, source);struct max9286_asd *mas; - mas =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, - source->fwnode, - struct max9286_asd); + mas =v4l2_async_nf_add_fwnode (&priv->notifier, source->fwnode, + struct max9286_asd);if (IS_ERR (mas)) {dev_err (dev,"Failed to add subdev for source %u: %ld" , i,PTR_ERR (mas)); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return PTR_ERR (mas); }
@@ -627,10 +626,10 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv) priv->notifier.ops = &max9286_notify_ops; - ret =v4l2_async_subdev_notifier_register (&priv->sd, &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" ); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -642,8 +641,8 @@ static void max9286_v4l2_notifier_unregister(struct max9286_priv *priv)if (!priv->nsources)return ; -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier); }static int max9286_s_stream (struct v4l2_subdev *sd,int enable)
drivers/media/i2c/st-mipid02.c +10 -12
@@ -876,11 +876,10 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) bridge->rx = ep;/* register async notifier so we get noticed when sensor is connected */ -v4l2_async_notifier_init (&bridge->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &bridge->notifier, -of_fwnode_handle (ep_node), - struct v4l2_async_subdev); +v4l2_async_nf_init (&bridge->notifier); + asd =v4l2_async_nf_add_fwnode_remote (&bridge->notifier, +of_fwnode_handle (ep_node), + struct v4l2_async_subdev);of_node_put (ep_node);if (IS_ERR (asd)) {
@@ -890,10 +889,9 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) } bridge->notifier.ops = &mipid02_notifier_ops; - ret =v4l2_async_subdev_notifier_register (&bridge->sd, - &bridge->notifier); + ret =v4l2_async_subdev_nf_register (&bridge->sd, &bridge->notifier);if (ret) -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier);return ret;
@@ -1031,8 +1029,8 @@ static int mipid02_probe(struct i2c_client *client)return 0 ; unregister_notifier: -v4l2_async_notifier_unregister (&bridge->notifier); -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_unregister (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier); power_off:mipid02_set_power_off (bridge); entity_cleanup:
@@ -1048,8 +1046,8 @@ static int mipid02_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct mipid02_dev *bridge =to_mipid02_dev (sd); -v4l2_async_notifier_unregister (&bridge->notifier); -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_unregister (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier);v4l2_async_unregister_subdev (&bridge->sd);mipid02_set_power_off (bridge);media_entity_cleanup (&bridge->sd.entity);
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +9 -8
@@ -1478,8 +1478,9 @@ static int cio2_parse_firmware(struct cio2_device *cio2)if (ret) goto err_parse; - s_asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &cio2->notifier, ep, struct sensor_async_subdev); + s_asd =v4l2_async_nf_add_fwnode_remote (&cio2->notifier, ep, + struct + sensor_async_subdev);if (IS_ERR (s_asd)) { ret =PTR_ERR (s_asd); goto err_parse;
@@ -1502,7 +1503,7 @@ static int cio2_parse_firmware(struct cio2_device *cio2)* suspend. */ cio2->notifier.ops = &cio2_async_ops; - ret =v4l2_async_notifier_register (&cio2->v4l2_dev, &cio2->notifier); + ret =v4l2_async_nf_register (&cio2->v4l2_dev, &cio2->notifier);if (ret)dev_err (&cio2->pci_dev->dev,"failed to register async notifier : %d\n" , ret);
@@ -1804,7 +1805,7 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,if (r) goto fail_v4l2_device_unregister; -v4l2_async_notifier_init (&cio2->notifier); +v4l2_async_nf_init (&cio2->notifier);/* Register notifier for subdevices we care */ r =cio2_parse_firmware (cio2);
@@ -1824,8 +1825,8 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,return 0 ; fail_clean_notifier: -v4l2_async_notifier_unregister (&cio2->notifier); -v4l2_async_notifier_cleanup (&cio2->notifier); +v4l2_async_nf_unregister (&cio2->notifier); +v4l2_async_nf_cleanup (&cio2->notifier);cio2_queues_exit (cio2); fail_v4l2_device_unregister:v4l2_device_unregister (&cio2->v4l2_dev);
@@ -1844,8 +1845,8 @@ static void cio2_pci_remove(struct pci_dev *pci_dev)struct cio2_device *cio2 =pci_get_drvdata (pci_dev);media_device_unregister (&cio2->media_dev); -v4l2_async_notifier_unregister (&cio2->notifier); -v4l2_async_notifier_cleanup (&cio2->notifier); +v4l2_async_nf_unregister (&cio2->notifier); +v4l2_async_nf_cleanup (&cio2->notifier);cio2_queues_exit (cio2);cio2_fbpt_exit_dummy (cio2);v4l2_device_unregister (&cio2->v4l2_dev);
drivers/media/platform/am437x/am437x-vpfe.c +10 -9
@@ -2297,7 +2297,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe)dev_dbg (dev,"vpfe_get_pdata\n" ); -v4l2_async_notifier_init (&vpfe->notifier); +v4l2_async_nf_init (&vpfe->notifier);if (!IS_ENABLED (CONFIG_OF ) || !dev->of_node)return dev->platform_data;
@@ -2365,9 +2365,10 @@ vpfe_get_pdata(struct vpfe_device *vpfe) goto cleanup; } - pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( - &vpfe->notifier,of_fwnode_handle (rem), - struct v4l2_async_subdev); + pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpfe->notifier, +of_fwnode_handle (rem), + struct + v4l2_async_subdev);of_node_put (rem);if (IS_ERR (pdata->asd[i])) goto cleanup;
@@ -2377,7 +2378,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe)return pdata; cleanup: -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);of_node_put (endpoint);return NULL ; }
@@ -2465,7 +2466,7 @@ static int vpfe_probe(struct platform_device *pdev) } vpfe->notifier.ops = &vpfe_async_ops; - ret =v4l2_async_notifier_register (&vpfe->v4l2_dev, &vpfe->notifier); + ret =v4l2_async_nf_register (&vpfe->v4l2_dev, &vpfe->notifier);if (ret) {vpfe_err (vpfe,"Error registering async notifier\n" ); ret = -EINVAL ;
@@ -2477,7 +2478,7 @@ static int vpfe_probe(struct platform_device *pdev) probe_out_v4l2_unregister:v4l2_device_unregister (&vpfe->v4l2_dev); probe_out_cleanup: -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);return ret; }
@@ -2490,8 +2491,8 @@ static int vpfe_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&vpfe->notifier); -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_unregister (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);v4l2_device_unregister (&vpfe->v4l2_dev);video_unregister_device (&vpfe->video_dev);
drivers/media/platform/atmel/atmel-isc-base.c +2 -2
@@ -2218,8 +2218,8 @@ void isc_subdev_cleanup(struct isc_device *isc)struct isc_subdev_entity *subdev_entity;list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -v4l2_async_notifier_unregister (&subdev_entity->notifier); -v4l2_async_notifier_cleanup (&subdev_entity->notifier); +v4l2_async_nf_unregister (&subdev_entity->notifier); +v4l2_async_nf_cleanup (&subdev_entity->notifier); }INIT_LIST_HEAD (&isc->subdev_entities);
drivers/media/platform/atmel/atmel-isi.c +8 -9
@@ -1159,12 +1159,11 @@ static int isi_graph_init(struct atmel_isi *isi)if (!ep)return -EINVAL ; -v4l2_async_notifier_init (&isi->notifier); +v4l2_async_nf_init (&isi->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isi->notifier, -of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&isi->notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))
@@ -1172,10 +1171,10 @@ static int isi_graph_init(struct atmel_isi *isi) isi->notifier.ops = &isi_graph_notify_ops; - ret =v4l2_async_notifier_register (&isi->v4l2_dev, &isi->notifier); + ret =v4l2_async_nf_register (&isi->v4l2_dev, &isi->notifier);if (ret <0 ) {dev_err (isi->dev,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&isi->notifier); +v4l2_async_nf_cleanup (&isi->notifier);return ret; }
@@ -1327,8 +1326,8 @@ static int atmel_isi_remove(struct platform_device *pdev) isi->p_fb_descriptors, isi->fb_descriptors_phys);pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&isi->notifier); -v4l2_async_notifier_cleanup (&isi->notifier); +v4l2_async_nf_unregister (&isi->notifier); +v4l2_async_nf_cleanup (&isi->notifier);v4l2_device_unregister (&isi->v4l2_dev);return 0 ;
drivers/media/platform/atmel/atmel-sama5d2-isc.c +8 -7
@@ -495,13 +495,14 @@ static int atmel_isc_probe(struct platform_device *pdev)list_for_each_entry (subdev_entity, &isc->subdev_entities, list) {struct v4l2_async_subdev *asd; +struct fwnode_handle *fwnode = +of_fwnode_handle (subdev_entity->epn); -v4l2_async_notifier_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &subdev_entity->notifier, -of_fwnode_handle (subdev_entity->epn), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, + fwnode, + struct v4l2_async_subdev);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
@@ -513,8 +514,8 @@ static int atmel_isc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &isc_async_ops; - ret =v4l2_async_notifier_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&isc->v4l2_dev, + &subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/atmel/atmel-sama7g5-isc.c +4 -4
@@ -506,9 +506,9 @@ static int microchip_xisc_probe(struct platform_device *pdev)list_for_each_entry (subdev_entity, &isc->subdev_entities, list) {struct v4l2_async_subdev *asd; -v4l2_async_notifier_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( + asd =v4l2_async_nf_add_fwnode_remote_subdev ( &subdev_entity->notifier,of_fwnode_handle (subdev_entity->epn), struct v4l2_async_subdev);
@@ -523,8 +523,8 @@ static int microchip_xisc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &isc_async_ops; - ret =v4l2_async_notifier_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&isc->v4l2_dev, + &subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/cadence/cdns-csi2rx.c +6 -8
@@ -401,21 +401,19 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } -v4l2_async_notifier_init (&csi2rx->notifier); +v4l2_async_nf_init (&csi2rx->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, - fwh, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi2rx->notifier, fwh, + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))return PTR_ERR (asd); csi2rx->notifier.ops = &csi2rx_notifier_ops; - ret =v4l2_async_subdev_notifier_register (&csi2rx->subdev, - &csi2rx->notifier); + ret =v4l2_async_subdev_nf_register (&csi2rx->subdev, &csi2rx->notifier);if (ret) -v4l2_async_notifier_cleanup (&csi2rx->notifier); +v4l2_async_nf_cleanup (&csi2rx->notifier);return ret; }
@@ -471,7 +469,7 @@ static int csi2rx_probe(struct platform_device *pdev)return 0 ; err_cleanup: -v4l2_async_notifier_cleanup (&csi2rx->notifier); +v4l2_async_nf_cleanup (&csi2rx->notifier); err_free_priv:kfree (csi2rx);return ret;
drivers/media/platform/davinci/vpif_capture.c +11 -10
@@ -1506,7 +1506,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)struct vpif_capture_chan_config *chan;unsigned int i; -v4l2_async_notifier_init (&vpif_obj.notifier); +v4l2_async_nf_init (&vpif_obj.notifier);/* * DT boot: OF node from parent device contains
@@ -1582,9 +1582,10 @@ vpif_capture_get_pdata(struct platform_device *pdev)dev_dbg (&pdev->dev,"Remote device %pOF found\n" , rem); sdinfo->name = rem->full_name; - pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( - &vpif_obj.notifier,of_fwnode_handle (rem), - struct v4l2_async_subdev); + pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpif_obj.notifier, +of_fwnode_handle (rem), + struct + v4l2_async_subdev);if (IS_ERR (pdata->asd[i])) goto err_cleanup;
@@ -1602,7 +1603,7 @@ vpif_capture_get_pdata(struct platform_device *pdev) err_cleanup:of_node_put (rem);of_node_put (endpoint); -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);return NULL ; }
@@ -1692,8 +1693,8 @@ static __init int vpif_probe(struct platform_device *pdev) goto probe_subdev_out; }else { vpif_obj.notifier.ops = &vpif_async_ops; - err =v4l2_async_notifier_register (&vpif_obj.v4l2_dev, - &vpif_obj.notifier); + err =v4l2_async_nf_register (&vpif_obj.v4l2_dev, + &vpif_obj.notifier);if (err) {vpif_err ("Error registering async notifier\n" ); err = -EINVAL ;
@@ -1711,7 +1712,7 @@ static __init int vpif_probe(struct platform_device *pdev) vpif_free:free_vpif_objs (); cleanup: -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);return err; }
@@ -1727,8 +1728,8 @@ static int vpif_remove(struct platform_device *device)struct channel_obj *ch;int i; -v4l2_async_notifier_unregister (&vpif_obj.notifier); -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_unregister (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);v4l2_device_unregister (&vpif_obj.v4l2_dev);kfree (vpif_obj.sd);
drivers/media/platform/exynos4-is/media-dev.c +10 -10
@@ -464,9 +464,9 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,return -EINVAL ; } - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &fmd->subdev_notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&fmd->subdev_notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);
@@ -557,7 +557,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) cleanup:of_node_put (ports); -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier);pm_runtime_put (fmd->pmf);return ret; }
@@ -1482,7 +1482,7 @@ static int fimc_md_probe(struct platform_device *pdev)platform_set_drvdata (pdev, fmd); -v4l2_async_notifier_init (&fmd->subdev_notifier); +v4l2_async_nf_init (&fmd->subdev_notifier); ret =fimc_md_register_platform_entities (fmd, dev->of_node);if (ret)
@@ -1510,8 +1510,8 @@ static int fimc_md_probe(struct platform_device *pdev) fmd->subdev_notifier.ops = &subdev_notifier_ops; fmd->num_sensors =0 ; - ret =v4l2_async_notifier_register (&fmd->v4l2_dev, - &fmd->subdev_notifier); + ret =v4l2_async_nf_register (&fmd->v4l2_dev, + &fmd->subdev_notifier);if (ret) goto err_clk_p; }
@@ -1523,7 +1523,7 @@ static int fimc_md_probe(struct platform_device *pdev) err_attr:device_remove_file (&pdev->dev, &dev_attr_subdev_conf_mode); err_cleanup: -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier); err_m_ent:fimc_md_unregister_entities (fmd); err_clk:
@@ -1543,8 +1543,8 @@ static int fimc_md_remove(struct platform_device *pdev)return 0 ;fimc_md_unregister_clk_provider (fmd); -v4l2_async_notifier_unregister (&fmd->subdev_notifier); -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_unregister (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier);v4l2_device_unregister (&fmd->v4l2_dev);device_remove_file (&pdev->dev, &dev_attr_subdev_conf_mode);
drivers/media/platform/marvell-ccic/cafe-driver.c +4 -5
@@ -544,12 +544,11 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; -v4l2_async_notifier_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier); - asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier, -i2c_adapter_id (cam->i2c_adapter), - ov7670_info.addr, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_i2c (&mcam->notifier, +i2c_adapter_id (cam->i2c_adapter), + ov7670_info.addr, struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out_smbus_shutdown;
drivers/media/platform/marvell-ccic/mcam-core.c +5 -5
@@ -1877,7 +1877,7 @@ int mccic_register(struct mcam_camera *cam) cam->mbus_code = mcam_def_mbus_code; cam->notifier.ops = &mccic_notify_ops; - ret =v4l2_async_notifier_register (&cam->v4l2_dev, &cam->notifier); + ret =v4l2_async_nf_register (&cam->v4l2_dev, &cam->notifier);if (ret <0 ) {cam_warn (cam,"failed to register a sensor notifier" ); goto out;
@@ -1914,9 +1914,9 @@ int mccic_register(struct mcam_camera *cam)return 0 ; out: -v4l2_async_notifier_unregister (&cam->notifier); +v4l2_async_nf_unregister (&cam->notifier);v4l2_device_unregister (&cam->v4l2_dev); -v4l2_async_notifier_cleanup (&cam->notifier); +v4l2_async_nf_cleanup (&cam->notifier);return ret; }EXPORT_SYMBOL_GPL (mccic_register);
@@ -1936,9 +1936,9 @@ void mccic_shutdown(struct mcam_camera *cam)if (cam->buffer_mode == B_vmalloc)mcam_free_dma_bufs (cam);v4l2_ctrl_handler_free (&cam->ctrl_handler); -v4l2_async_notifier_unregister (&cam->notifier); +v4l2_async_nf_unregister (&cam->notifier);v4l2_device_unregister (&cam->v4l2_dev); -v4l2_async_notifier_cleanup (&cam->notifier); +v4l2_async_nf_cleanup (&cam->notifier); }EXPORT_SYMBOL_GPL (mccic_shutdown);
drivers/media/platform/marvell-ccic/mmp-driver.c +3 -3
@@ -239,10 +239,10 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; -v4l2_async_notifier_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, ep, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&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 +12 -9
@@ -2003,7 +2003,7 @@ static int isp_remove(struct platform_device *pdev) {struct isp_device *isp =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&isp->notifier); +v4l2_async_nf_unregister (&isp->notifier);isp_unregister_entities (isp);isp_cleanup_modules (isp);isp_xclk_cleanup (isp);
@@ -2013,7 +2013,7 @@ static int isp_remove(struct platform_device *pdev)__omap3isp_put (isp, false);media_entity_enum_cleanup (&isp->crashed); -v4l2_async_notifier_cleanup (&isp->notifier); +v4l2_async_nf_cleanup (&isp->notifier);kfree (isp);
@@ -2170,8 +2170,9 @@ static int isp_parse_of_endpoints(struct isp_device *isp) ret =v4l2_fwnode_endpoint_parse (ep, &vep);if (!ret) { - isd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep, struct isp_async_subdev); + isd =v4l2_async_nf_add_fwnode_remote (&isp->notifier, + ep, struct + isp_async_subdev);if (!IS_ERR (isd))isp_parse_of_parallel_endpoint (isp->dev, &vep, &isd->bus); }
@@ -2209,8 +2210,10 @@ static int isp_parse_of_endpoints(struct isp_device *isp) }if (!ret) { - isd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep, struct isp_async_subdev); + isd =v4l2_async_nf_add_fwnode_remote (&isp->notifier, + ep, + struct + isp_async_subdev);if (!IS_ERR (isd)) {switch (vep.bus_type) {
@@ -2287,7 +2290,7 @@ static int isp_probe(struct platform_device *pdev)mutex_init (&isp->isp_mutex);spin_lock_init (&isp->stat_lock); -v4l2_async_notifier_init (&isp->notifier); +v4l2_async_nf_init (&isp->notifier); isp->dev = &pdev->dev; ret =isp_parse_of_endpoints (isp);
@@ -2416,7 +2419,7 @@ static int isp_probe(struct platform_device *pdev) isp->notifier.ops = &isp_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&isp->v4l2_dev, &isp->notifier); + ret =v4l2_async_nf_register (&isp->v4l2_dev, &isp->notifier);if (ret) goto error_register_entities;
@@ -2435,7 +2438,7 @@ static int isp_probe(struct platform_device *pdev)isp_xclk_cleanup (isp);__omap3isp_put (isp, false); error: -v4l2_async_notifier_cleanup (&isp->notifier); +v4l2_async_nf_cleanup (&isp->notifier);mutex_destroy (&isp->isp_mutex); error_release_isp:kfree (isp);
drivers/media/platform/pxa_camera.c +12 -14
@@ -2249,10 +2249,9 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &pcdev->notifier, -of_fwnode_handle (np), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&pcdev->notifier, +of_fwnode_handle (np), + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); out:
@@ -2289,7 +2288,7 @@ 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); +v4l2_async_nf_init (&pcdev->notifier); pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) {
@@ -2297,11 +2296,10 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->platform_flags = pcdev->pdata->flags; pcdev->mclk = pcdev->pdata->mclk_10khz *10000 ; - asd =v4l2_async_notifier_add_i2c_subdev ( - &pcdev->notifier, - pcdev->pdata->sensor_i2c_adapter_id, - pcdev->pdata->sensor_i2c_address, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_i2c (&pcdev->notifier, + pcdev->pdata->sensor_i2c_adapter_id, + pcdev->pdata->sensor_i2c_address, + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); }else if (pdev->dev.of_node) {
@@ -2402,13 +2400,13 @@ static int pxa_camera_probe(struct platform_device *pdev) goto exit_notifier_cleanup; pcdev->notifier.ops = &pxa_camera_sensor_ops; - err =v4l2_async_notifier_register (&pcdev->v4l2_dev, &pcdev->notifier); + err =v4l2_async_nf_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) goto exit_notifier_cleanup;return 0 ; exit_notifier_cleanup: -v4l2_async_notifier_cleanup (&pcdev->notifier); +v4l2_async_nf_cleanup (&pcdev->notifier);v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);
@@ -2432,8 +2430,8 @@ static int pxa_camera_remove(struct platform_device *pdev)dma_release_channel (pcdev->dma_chans[1 ]);dma_release_channel (pcdev->dma_chans[2 ]); -v4l2_async_notifier_unregister (&pcdev->notifier); -v4l2_async_notifier_cleanup (&pcdev->notifier); +v4l2_async_nf_unregister (&pcdev->notifier); +v4l2_async_nf_cleanup (&pcdev->notifier);v4l2_device_unregister (&pcdev->v4l2_dev);
drivers/media/platform/qcom/camss/camss.c +9 -9
@@ -886,9 +886,9 @@ static int camss_of_parse_ports(struct camss *camss) goto err_cleanup; } - csd =v4l2_async_notifier_add_fwnode_subdev ( - &camss->notifier,of_fwnode_handle (remote), - struct camss_async_subdev); + csd =v4l2_async_nf_add_fwnode (&camss->notifier, +of_fwnode_handle (remote), + struct camss_async_subdev);of_node_put (remote);if (IS_ERR (csd)) { ret =PTR_ERR (csd);
@@ -1361,7 +1361,7 @@ static int camss_probe(struct platform_device *pdev) goto err_free; } -v4l2_async_notifier_init (&camss->notifier); +v4l2_async_nf_init (&camss->notifier); num_subdevs =camss_of_parse_ports (camss);if (num_subdevs <0 ) {
@@ -1397,8 +1397,8 @@ static int camss_probe(struct platform_device *pdev)if (num_subdevs) { camss->notifier.ops = &camss_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&camss->v4l2_dev, - &camss->notifier); + ret =v4l2_async_nf_register (&camss->v4l2_dev, + &camss->notifier);if (ret) { dev_err(dev, "Failed to register async subdev nodes: %d\n",
@@ -1436,7 +1436,7 @@ static int camss_probe(struct platform_device *pdev) err_register_entities:v4l2_device_unregister (&camss->v4l2_dev); err_cleanup: -v4l2_async_notifier_cleanup (&camss->notifier); +v4l2_async_nf_cleanup (&camss->notifier); err_free:kfree (camss);
@@ -1478,8 +1478,8 @@ static int camss_remove(struct platform_device *pdev) {struct camss *camss =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&camss->notifier); -v4l2_async_notifier_cleanup (&camss->notifier); +v4l2_async_nf_unregister (&camss->notifier); +v4l2_async_nf_cleanup (&camss->notifier);camss_unregister_entities (camss);if (atomic_read (&camss->ref_count) ==0 )
drivers/media/platform/rcar-vin/rcar-core.c +16 -18
@@ -641,8 +641,8 @@ static int rvin_parallel_parse_of(struct rvin_dev *vin) goto out; } - asd =v4l2_async_notifier_add_fwnode_subdev (&vin->notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&vin->notifier, fwnode, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -661,7 +661,7 @@ static int rvin_parallel_init(struct rvin_dev *vin) {int ret; -v4l2_async_notifier_init (&vin->notifier); +v4l2_async_nf_init (&vin->notifier); ret =rvin_parallel_parse_of (vin);if (ret)
@@ -675,10 +675,10 @@ static int rvin_parallel_init(struct rvin_dev *vin) to_of_node(vin->parallel.asd->match.fwnode)); vin->notifier.ops = &rvin_parallel_notify_ops; - ret =v4l2_async_notifier_register (&vin->v4l2_dev, &vin->notifier); + ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&vin->notifier); +v4l2_async_nf_cleanup (&vin->notifier);return ret; }
@@ -841,9 +841,8 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id) goto out; } - asd =v4l2_async_notifier_add_fwnode_subdev (&vin->group->notifier, - fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&vin->group->notifier, fwnode, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -882,7 +881,7 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)mutex_unlock (&vin->group->lock); -v4l2_async_notifier_init (&vin->group->notifier); +v4l2_async_nf_init (&vin->group->notifier);/* * Have all VIN's look for CSI-2 subdevices. Some subdevices will
@@ -907,11 +906,10 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)return 0 ; vin->group->notifier.ops = &rvin_group_notify_ops; - ret =v4l2_async_notifier_register (&vin->v4l2_dev, - &vin->group->notifier); + ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->group->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier);return ret; }
@@ -1455,8 +1453,8 @@ static int rcar_vin_probe(struct platform_device *pdev)if (vin->info->use_mc) {mutex_lock (&vin->group->lock);if (&vin->v4l2_dev == vin->group->notifier.v4l2_dev) { -v4l2_async_notifier_unregister (&vin->group->notifier); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_unregister (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier); }mutex_unlock (&vin->group->lock);rvin_group_put (vin);
@@ -1476,12 +1474,12 @@ static int rcar_vin_remove(struct platform_device *pdev)rvin_v4l2_unregister (vin); -v4l2_async_notifier_unregister (&vin->notifier); -v4l2_async_notifier_cleanup (&vin->notifier); +v4l2_async_nf_unregister (&vin->notifier); +v4l2_async_nf_cleanup (&vin->notifier);if (vin->info->use_mc) { -v4l2_async_notifier_unregister (&vin->group->notifier); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_unregister (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier);rvin_group_put (vin); }
drivers/media/platform/rcar-vin/rcar-csi2.c +9 -10
@@ -917,19 +917,18 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)dev_dbg (priv->dev,"Found '%pOF'\n" ,to_of_node (fwnode)); -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier); priv->notifier.ops = &rcar_csi2_notify_ops; - asd =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&priv->notifier, fwnode, + struct v4l2_async_subdev);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd); - ret =v4l2_async_subdev_notifier_register (&priv->subdev, - &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->subdev, &priv->notifier);if (ret) -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -1285,8 +1284,8 @@ static int rcsi2_probe(struct platform_device *pdev)return 0 ; error: -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -1295,8 +1294,8 @@ static int rcsi2_remove(struct platform_device *pdev) {struct rcar_csi2 *priv =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (&priv->subdev);pm_runtime_disable (&pdev->dev);
drivers/media/platform/rcar_drif.c +7 -7
@@ -1212,7 +1212,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)struct fwnode_handle *fwnode, *ep;struct v4l2_async_subdev *asd; -v4l2_async_notifier_init (notifier); +v4l2_async_nf_init (notifier); ep =fwnode_graph_get_next_endpoint (of_fwnode_handle (sdr->dev->of_node),NULL );
@@ -1229,8 +1229,8 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)return -EINVAL ; } - asd =v4l2_async_notifier_add_fwnode_subdev (notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (notifier, fwnode, + struct v4l2_async_subdev);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd);
@@ -1346,7 +1346,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr) sdr->notifier.ops = &rcar_drif_notify_ops;/* Register notifier */ - ret =v4l2_async_notifier_register (&sdr->v4l2_dev, &sdr->notifier); + ret =v4l2_async_nf_register (&sdr->v4l2_dev, &sdr->notifier);if (ret <0 ) {dev_err (sdr->dev,"failed: notifier register ret %d\n" , ret); goto cleanup;
@@ -1355,7 +1355,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)return ret; cleanup: -v4l2_async_notifier_cleanup (&sdr->notifier); +v4l2_async_nf_cleanup (&sdr->notifier); error:v4l2_device_unregister (&sdr->v4l2_dev);
@@ -1365,8 +1365,8 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)/* V4L2 SDR device remove */ static void rcar_drif_sdr_remove (struct rcar_drif_sdr *sdr) { -v4l2_async_notifier_unregister (&sdr->notifier); -v4l2_async_notifier_cleanup (&sdr->notifier); +v4l2_async_nf_unregister (&sdr->notifier); +v4l2_async_nf_cleanup (&sdr->notifier);v4l2_device_unregister (&sdr->v4l2_dev); }
drivers/media/platform/renesas-ceu.c +14 -15
@@ -1513,12 +1513,12 @@ 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 =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, - async_sd->i2c_adapter_id, - async_sd->i2c_address, - struct ceu_subdev); + ceu_sd =v4l2_async_nf_add_i2c (&ceudev->notifier, + async_sd->i2c_adapter_id, + async_sd->i2c_address, + struct ceu_subdev);if (IS_ERR (ceu_sd)) { -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);return PTR_ERR (ceu_sd); } ceu_sd->mbus_flags = async_sd->flags;
@@ -1576,9 +1576,9 @@ static int ceu_parse_dt(struct ceu_device *ceudev) }/* Setup the ceu subdevice and the async subdevice. */ - ceu_sd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &ceudev->notifier,of_fwnode_handle (ep), - struct ceu_subdev); + ceu_sd =v4l2_async_nf_add_fwnode_remote (&ceudev->notifier, +of_fwnode_handle (ep), + struct ceu_subdev);if (IS_ERR (ceu_sd)) { ret =PTR_ERR (ceu_sd); goto error_cleanup;
@@ -1592,7 +1592,7 @@ static int ceu_parse_dt(struct ceu_device *ceudev)return num_ep; error_cleanup: -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);of_node_put (ep);return ret; }
@@ -1669,7 +1669,7 @@ static int ceu_probe(struct platform_device *pdev)if (ret) goto error_pm_disable; -v4l2_async_notifier_init (&ceudev->notifier); +v4l2_async_nf_init (&ceudev->notifier);if (IS_ENABLED (CONFIG_OF ) && dev->of_node) { ceu_data =of_device_get_match_data (dev);
@@ -1691,8 +1691,7 @@ static int ceu_probe(struct platform_device *pdev) ceudev->notifier.v4l2_dev = &ceudev->v4l2_dev; ceudev->notifier.ops = &ceu_notify_ops; - ret =v4l2_async_notifier_register (&ceudev->v4l2_dev, - &ceudev->notifier); + ret =v4l2_async_nf_register (&ceudev->v4l2_dev, &ceudev->notifier);if (ret) goto error_cleanup;
@@ -1701,7 +1700,7 @@ static int ceu_probe(struct platform_device *pdev)return 0 ; error_cleanup: -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier); error_v4l2_unregister:v4l2_device_unregister (&ceudev->v4l2_dev); error_pm_disable:
@@ -1718,9 +1717,9 @@ static int ceu_remove(struct platform_device *pdev)pm_runtime_disable (ceudev->dev); -v4l2_async_notifier_unregister (&ceudev->notifier); +v4l2_async_nf_unregister (&ceudev->notifier); -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);v4l2_device_unregister (&ceudev->v4l2_dev);
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +9 -8
@@ -246,7 +246,7 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)unsigned int next_id =0 ;int ret; -v4l2_async_notifier_init (ntf); +v4l2_async_nf_init (ntf);while (1 ) {struct v4l2_fwnode_endpoint vep = {
@@ -265,8 +265,9 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)if (ret) goto err_parse; - rk_asd =v4l2_async_notifier_add_fwnode_remote_subdev (ntf, ep, - struct rkisp1_sensor_async); + rk_asd =v4l2_async_nf_add_fwnode_remote (ntf, ep, + struct + rkisp1_sensor_async);if (IS_ERR (rk_asd)) { ret =PTR_ERR (rk_asd); goto err_parse;
@@ -286,16 +287,16 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)continue ; err_parse:fwnode_handle_put (ep); -v4l2_async_notifier_cleanup (ntf); +v4l2_async_nf_cleanup (ntf);return ret; }if (next_id ==0 )dev_dbg (rkisp1->dev,"no remote subdevice found\n" ); ntf->ops = &rkisp1_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&rkisp1->v4l2_dev, ntf); + ret =v4l2_async_nf_register (&rkisp1->v4l2_dev, ntf);if (ret) { -v4l2_async_notifier_cleanup (ntf); +v4l2_async_nf_cleanup (ntf);return ret; }return 0 ;
@@ -542,8 +543,8 @@ static int rkisp1_remove(struct platform_device *pdev) {struct rkisp1_device *rkisp1 =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&rkisp1->notifier); -v4l2_async_notifier_cleanup (&rkisp1->notifier); +v4l2_async_nf_unregister (&rkisp1->notifier); +v4l2_async_nf_cleanup (&rkisp1->notifier);rkisp1_params_unregister (rkisp1);rkisp1_stats_unregister (rkisp1);
drivers/media/platform/stm32/stm32-dcmi.c +9 -9
@@ -1824,11 +1824,11 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)return -EINVAL ; } -v4l2_async_notifier_init (&dcmi->notifier); +v4l2_async_nf_init (&dcmi->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &dcmi->notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&dcmi->notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);
@@ -1839,10 +1839,10 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi) dcmi->notifier.ops = &dcmi_graph_notify_ops; - ret =v4l2_async_notifier_register (&dcmi->v4l2_dev, &dcmi->notifier); + ret =v4l2_async_nf_register (&dcmi->v4l2_dev, &dcmi->notifier);if (ret <0 ) {dev_err (dcmi->dev,"Failed to register notifier\n" ); -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier);return ret; }
@@ -2060,7 +2060,7 @@ static int dcmi_probe(struct platform_device *pdev)return 0 ; err_cleanup: -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier); err_media_entity_cleanup:media_entity_cleanup (&dcmi->vdev->entity); err_device_release:
@@ -2080,8 +2080,8 @@ static int dcmi_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&dcmi->notifier); -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_unregister (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier);media_entity_cleanup (&dcmi->vdev->entity);v4l2_device_unregister (&dcmi->v4l2_dev);media_device_cleanup (&dcmi->mdev);
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +6 -6
@@ -122,7 +122,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -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, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -244,7 +244,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)if (ret) goto err_unregister_media; - ret =v4l2_async_notifier_register (&csi->v4l, &csi->notifier); + ret =v4l2_async_nf_register (&csi->v4l, &csi->notifier);if (ret) {dev_err (csi->dev,"Couldn't register our notifier.\n" ); goto err_unregister_media;
@@ -268,8 +268,8 @@ static int sun4i_csi_remove(struct platform_device *pdev) {struct sun4i_csi *csi =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);vb2_video_unregister_device (&csi->vdev);media_device_unregister (&csi->mdev);sun4i_csi_dma_unregister (csi);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +10 -9
@@ -717,8 +717,8 @@ static int sun6i_csi_fwnode_parse(struct device *dev,static void sun6i_csi_v4l2_cleanup (struct sun6i_csi *csi) {media_device_unregister (&csi->media_dev); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);sun6i_video_cleanup (&csi->video);v4l2_device_unregister (&csi->v4l2_dev);v4l2_ctrl_handler_free (&csi->ctrl_handler);
@@ -737,7 +737,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) "platform:%s", dev_name(csi->dev));media_device_init (&csi->media_dev); -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,0 );if (ret) {
@@ -759,16 +759,17 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)if (ret) goto unreg_v4l2; - ret =v4l2_async_notifier_parse_fwnode_endpoints (csi->dev, - &csi->notifier, -sizeof (struct v4l2_async_subdev ), - sun6i_csi_fwnode_parse); + ret =v4l2_async_nf_parse_fwnode_endpoints (csi->dev, + &csi->notifier, +sizeof (struct +v4l2_async_subdev ), + sun6i_csi_fwnode_parse);if (ret) goto clean_video; csi->notifier.ops = &sun6i_csi_async_ops; - ret =v4l2_async_notifier_register (&csi->v4l2_dev, &csi->notifier); + ret =v4l2_async_nf_register (&csi->v4l2_dev, &csi->notifier);if (ret) {dev_err (csi->dev,"notifier registration failed\n" ); goto clean_video;
@@ -783,7 +784,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) free_ctrl:v4l2_ctrl_handler_free (&csi->ctrl_handler); clean_media: -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);media_device_cleanup (&csi->media_dev);return ret;
drivers/media/platform/ti-vpe/cal.c +8 -8
@@ -693,7 +693,7 @@ static int cal_async_notifier_register(struct cal_dev *cal)unsigned int i;int ret; -v4l2_async_notifier_init (&cal->notifier); +v4l2_async_nf_init (&cal->notifier); cal->notifier.ops = &cal_async_notifier_ops;for (i =0 ; i < cal->data->num_csi2_phy; ++i) {
@@ -705,9 +705,9 @@ static int cal_async_notifier_register(struct cal_dev *cal)continue ; fwnode =of_fwnode_handle (phy->sensor_node); - casd =v4l2_async_notifier_add_fwnode_subdev (&cal->notifier, - fwnode, - struct cal_v4l2_async_subdev); + casd =v4l2_async_nf_add_fwnode (&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 (casd);
@@ -717,7 +717,7 @@ static int cal_async_notifier_register(struct cal_dev *cal) casd->phy = phy; } - ret =v4l2_async_notifier_register (&cal->v4l2_dev, &cal->notifier); + ret =v4l2_async_nf_register (&cal->v4l2_dev, &cal->notifier);if (ret) {cal_err (cal,"Error registering async notifier\n" ); goto error;
@@ -726,14 +726,14 @@ static int cal_async_notifier_register(struct cal_dev *cal)return 0 ; error: -v4l2_async_notifier_cleanup (&cal->notifier); +v4l2_async_nf_cleanup (&cal->notifier);return ret; }static void cal_async_notifier_unregister (struct cal_dev *cal) { -v4l2_async_notifier_unregister (&cal->notifier); -v4l2_async_notifier_cleanup (&cal->notifier); +v4l2_async_nf_unregister (&cal->notifier); +v4l2_async_nf_cleanup (&cal->notifier); }/* ------------------------------------------------------------------
drivers/media/platform/video-mux.c +8 -9
@@ -360,7 +360,7 @@ static int video_mux_async_register(struct video_mux *vmux,unsigned int i;int ret; -v4l2_async_notifier_init (&vmux->notifier); +v4l2_async_nf_init (&vmux->notifier);for (i =0 ; i < num_input_pads; i++) {struct v4l2_async_subdev *asd;
@@ -372,8 +372,8 @@ static int video_mux_async_register(struct video_mux *vmux,if (!ep)continue ; - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &vmux->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&vmux->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -387,8 +387,7 @@ static int video_mux_async_register(struct video_mux *vmux, vmux->notifier.ops = &video_mux_notify_ops; - ret =v4l2_async_subdev_notifier_register (&vmux->subdev, - &vmux->notifier); + ret =v4l2_async_subdev_nf_register (&vmux->subdev, &vmux->notifier);if (ret)return ret;
@@ -469,8 +468,8 @@ static int video_mux_probe(struct platform_device *pdev) ret =video_mux_async_register (vmux, num_pads -1 );if (ret) { -v4l2_async_notifier_unregister (&vmux->notifier); -v4l2_async_notifier_cleanup (&vmux->notifier); +v4l2_async_nf_unregister (&vmux->notifier); +v4l2_async_nf_cleanup (&vmux->notifier); }return ret;
@@ -481,8 +480,8 @@ static int video_mux_remove(struct platform_device *pdev)struct video_mux *vmux =platform_get_drvdata (pdev);struct v4l2_subdev *sd = &vmux->subdev; -v4l2_async_notifier_unregister (&vmux->notifier); -v4l2_async_notifier_cleanup (&vmux->notifier); +v4l2_async_nf_unregister (&vmux->notifier); +v4l2_async_nf_cleanup (&vmux->notifier);v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);
drivers/media/platform/xilinx/xilinx-vipp.c +8 -9
@@ -382,9 +382,8 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,continue ; } - xge =v4l2_async_notifier_add_fwnode_subdev ( - &xdev->notifier, remote, - struct xvip_graph_entity); + xge =v4l2_async_nf_add_fwnode (&xdev->notifier, remote, + struct xvip_graph_entity);fwnode_handle_put (remote);if (IS_ERR (xge)) { ret =PTR_ERR (xge);
@@ -395,7 +394,7 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,return 0 ; err_notifier_cleanup: -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);fwnode_handle_put (ep);return ret; }
@@ -420,7 +419,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev) entity =to_xvip_entity (asd); ret =xvip_graph_parse_one (xdev, entity->asd.match.fwnode);if (ret <0 ) { -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);break ; } }
@@ -496,8 +495,8 @@ static void xvip_graph_cleanup(struct xvip_composite_device *xdev)struct xvip_dma *dmap;struct xvip_dma *dma; -v4l2_async_notifier_unregister (&xdev->notifier); -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_unregister (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);list_for_each_entry_safe (dma, dmap, &xdev->dmas, list) {xvip_dma_cleanup (dma);
@@ -532,7 +531,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev)/* Register the subdevices notifier. */ xdev->notifier.ops = &xvip_graph_notify_ops; - ret =v4l2_async_notifier_register (&xdev->v4l2_dev, &xdev->notifier); + ret =v4l2_async_nf_register (&xdev->v4l2_dev, &xdev->notifier);if (ret <0 ) {dev_err (xdev->dev,"notifier registration failed\n" ); goto done;
@@ -596,7 +595,7 @@ static int xvip_composite_probe(struct platform_device *pdev) xdev->dev = &pdev->dev;INIT_LIST_HEAD (&xdev->dmas); -v4l2_async_notifier_init (&xdev->notifier); +v4l2_async_nf_init (&xdev->notifier); ret =xvip_composite_v4l2_init (xdev);if (ret <0 )
drivers/media/v4l2-core/v4l2-async.c +82 -86
470 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-fwnode.c +35 -39
154 lines not on this page · raw message
drivers/staging/media/imx/imx-media-csi.c +8 -9
@@ -1924,7 +1924,7 @@ static int imx_csi_async_register(struct csi_priv *priv)unsigned int port;int ret; -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier);/* get this CSI's port id */ ret =fwnode_property_read_u32 (dev_fwnode (priv->dev),"reg" , &port);
@@ -1935,8 +1935,8 @@ static int imx_csi_async_register(struct csi_priv *priv) port,0 , FWNODE_GRAPH_ENDPOINT_NEXT);if (ep) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &priv->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -1950,8 +1950,7 @@ static int imx_csi_async_register(struct csi_priv *priv) priv->notifier.ops = &csi_notify_ops; - ret =v4l2_async_subdev_notifier_register (&priv->sd, - &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier);if (ret)return ret;
@@ -2040,8 +2039,8 @@ static int imx_csi_probe(struct platform_device *pdev)return 0 ; cleanup: -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier); free:v4l2_ctrl_handler_free (&priv->ctrl_hdlr);mutex_destroy (&priv->lock);
@@ -2055,8 +2054,8 @@ static int imx_csi_remove(struct platform_device *pdev)v4l2_ctrl_handler_free (&priv->ctrl_hdlr);mutex_destroy (&priv->lock); -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);
drivers/staging/media/imx/imx-media-dev-common.c +3 -4
@@ -379,7 +379,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev,INIT_LIST_HEAD (&imxmd->vdev_list); -v4l2_async_notifier_init (&imxmd->notifier); +v4l2_async_nf_init (&imxmd->notifier);return imxmd;
@@ -403,11 +403,10 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,/* prepare the async subdev notifier and register it */ imxmd->notifier.ops = ops ? ops : &imx_media_notifier_ops; - ret =v4l2_async_notifier_register (&imxmd->v4l2_dev, - &imxmd->notifier); + ret =v4l2_async_nf_register (&imxmd->v4l2_dev, &imxmd->notifier);if (ret) {v4l2_err (&imxmd->v4l2_dev, -"v4l2_async_notifier_register failed with %d\n" , ret); +"v4l2_async_nf_register failed with %d\n" , ret);return ret; }
drivers/staging/media/imx/imx-media-dev.c +3 -3
@@ -94,7 +94,7 @@ static int imx_media_probe(struct platform_device *pdev)return 0 ; cleanup: -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md);
@@ -113,9 +113,9 @@ static int imx_media_remove(struct platform_device *pdev) imxmd->m2m_vdev =NULL ; } -v4l2_async_notifier_unregister (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier);imx_media_unregister_ipu_internal_subdevs (imxmd); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);media_device_unregister (&imxmd->md);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md);
drivers/staging/media/imx/imx-media-of.c +3 -3
@@ -29,9 +29,9 @@ 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), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&imxmd->notifier, +of_fwnode_handle (csi_np), + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd);if (ret == -EEXIST )
drivers/staging/media/imx/imx6-mipi-csi2.c +8 -9
@@ -647,7 +647,7 @@ static int csi2_async_register(struct csi2_dev *csi2)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi2->notifier); +v4l2_async_nf_init (&csi2->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi2->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -663,8 +663,8 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi2->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi2->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);if (IS_ERR (asd))
@@ -672,8 +672,7 @@ static int csi2_async_register(struct csi2_dev *csi2) csi2->notifier.ops = &csi2_notify_ops; - ret =v4l2_async_subdev_notifier_register (&csi2->sd, - &csi2->notifier); + ret =v4l2_async_subdev_nf_register (&csi2->sd, &csi2->notifier);if (ret)return ret;
@@ -768,8 +767,8 @@ static int csi2_probe(struct platform_device *pdev)return 0 ; clean_notifier: -v4l2_async_notifier_unregister (&csi2->notifier); -v4l2_async_notifier_cleanup (&csi2->notifier); +v4l2_async_nf_unregister (&csi2->notifier); +v4l2_async_nf_cleanup (&csi2->notifier);clk_disable_unprepare (csi2->dphy_clk); pllref_off:clk_disable_unprepare (csi2->pllref_clk);
@@ -783,8 +782,8 @@ static int csi2_remove(struct platform_device *pdev)struct v4l2_subdev *sd =platform_get_drvdata (pdev);struct csi2_dev *csi2 =sd_to_dev (sd); -v4l2_async_notifier_unregister (&csi2->notifier); -v4l2_async_notifier_cleanup (&csi2->notifier); +v4l2_async_nf_unregister (&csi2->notifier); +v4l2_async_nf_cleanup (&csi2->notifier);v4l2_async_unregister_subdev (sd);clk_disable_unprepare (csi2->dphy_clk);clk_disable_unprepare (csi2->pllref_clk);
drivers/staging/media/imx/imx7-media-csi.c +12 -12
@@ -1107,13 +1107,13 @@ static int imx7_csi_async_register(struct imx7_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );if (ep) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -1127,7 +1127,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi) csi->notifier.ops = &imx7_csi_notify_ops; - ret =v4l2_async_subdev_notifier_register (&csi->sd, &csi->notifier); + ret =v4l2_async_subdev_nf_register (&csi->sd, &csi->notifier);if (ret)return ret;
@@ -1218,12 +1218,12 @@ static int imx7_csi_probe(struct platform_device *pdev)return 0 ; subdev_notifier_cleanup: -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); cleanup: -v4l2_async_notifier_unregister (&imxmd->notifier); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_unregister (&imxmd->md);media_device_cleanup (&imxmd->md);
@@ -1240,15 +1240,15 @@ static int imx7_csi_remove(struct platform_device *pdev)struct imx7_csi *csi =v4l2_get_subdevdata (sd);struct imx_media_dev *imxmd = csi->imxmd; -v4l2_async_notifier_unregister (&imxmd->notifier); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);media_device_unregister (&imxmd->md);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);v4l2_async_unregister_subdev (sd);mutex_destroy (&csi->lock);
drivers/staging/media/imx/imx7-mipi-csis.c +8 -8
@@ -1164,7 +1164,7 @@ static int mipi_csis_async_register(struct csi_state *state)unsigned int i;int ret; -v4l2_async_notifier_init (&state->notifier); +v4l2_async_nf_init (&state->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (state->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -1189,8 +1189,8 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &state->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&state->notifier, ep, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto err_parse;
@@ -1200,7 +1200,7 @@ static int mipi_csis_async_register(struct csi_state *state) state->notifier.ops = &mipi_csis_notify_ops; - ret =v4l2_async_subdev_notifier_register (&state->sd, &state->notifier); + ret =v4l2_async_subdev_nf_register (&state->sd, &state->notifier);if (ret)return ret;
@@ -1431,8 +1431,8 @@ static int mipi_csis_probe(struct platform_device *pdev)mipi_csis_debugfs_exit (state); cleanup:media_entity_cleanup (&state->sd.entity); -v4l2_async_notifier_unregister (&state->notifier); -v4l2_async_notifier_cleanup (&state->notifier); +v4l2_async_nf_unregister (&state->notifier); +v4l2_async_nf_cleanup (&state->notifier);v4l2_async_unregister_subdev (&state->sd); disable_clock:mipi_csis_clk_disable (state);
@@ -1447,8 +1447,8 @@ static int mipi_csis_remove(struct platform_device *pdev)struct csi_state *state =mipi_sd_to_csis_state (sd);mipi_csis_debugfs_exit (state); -v4l2_async_notifier_unregister (&state->notifier); -v4l2_async_notifier_cleanup (&state->notifier); +v4l2_async_nf_unregister (&state->notifier); +v4l2_async_nf_cleanup (&state->notifier);v4l2_async_unregister_subdev (&state->sd);pm_runtime_disable (&pdev->dev);
drivers/staging/media/tegra-video/vi.c +8 -9
@@ -1272,7 +1272,7 @@ static int tegra_channel_init(struct tegra_vi_channel *chan) }if (!IS_ENABLED (CONFIG_VIDEO_TEGRA_TPG )) -v4l2_async_notifier_init (&chan->notifier); +v4l2_async_nf_init (&chan->notifier);return 0 ;
@@ -1811,8 +1811,8 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,continue ; } - tvge =v4l2_async_notifier_add_fwnode_subdev (&chan->notifier, remote, - struct tegra_vi_graph_entity); + tvge =v4l2_async_nf_add_fwnode (&chan->notifier, remote, + struct tegra_vi_graph_entity);if (IS_ERR (tvge)) { ret =PTR_ERR (tvge); dev_err(vi->dev,
@@ -1834,7 +1834,7 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan, cleanup:dev_err (vi->dev,"failed parsing the graph: %d\n" , ret); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier);of_node_put (node);return ret; }
@@ -1868,13 +1868,12 @@ static int tegra_vi_graph_init(struct tegra_vi *vi)continue ; chan->notifier.ops = &tegra_vi_async_ops; - ret =v4l2_async_notifier_register (&vid->v4l2_dev, - &chan->notifier); + ret =v4l2_async_nf_register (&vid->v4l2_dev, &chan->notifier);if (ret <0 ) {dev_err (vi->dev,"failed to register channel %d notifier: %d\n" , chan->portnos[0 ], ret); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier); } }
@@ -1887,8 +1886,8 @@ static void tegra_vi_graph_cleanup(struct tegra_vi *vi)list_for_each_entry (chan, &vi->vi_chans, list) {vb2_video_unregister_device (&chan->video); -v4l2_async_notifier_unregister (&chan->notifier); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_unregister (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier); } }
include/media/v4l2-async.h +51 -54
198 lines not on this page · raw message
include/media/v4l2-fwnode.h +6 -6
@@ -463,7 +463,7 @@ typedef int (*parse_endpoint_func)(struct device *dev, struct v4l2_async_subdev *asd);/** -* v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a +* v4l2_async_nf_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a * device node * @dev: the device the endpoints of which are to be parsed * @notifier: notifier for @dev
@@ -496,7 +496,7 @@ typedef int (*parse_endpoint_func)(struct device *dev,* to retain that configuration, the user needs to allocate memory for it. * * Any notifier populated using this function must be released with a call to -* v4l2_async_notifier_cleanup() after it has been unregistered and the async +* v4l2_async_nf_cleanup() after it has been unregistered and the async * sub-devices are no longer in use, even if the function returned an error. * * Return: %0 on success, including when no async sub-devices are found
@@ -505,10 +505,10 @@ typedef int (*parse_endpoint_func)(struct device *dev,* Other error codes as returned by @parse_endpoint */ int -v4l2_async_notifier_parse_fwnode_endpoints (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size, -parse_endpoint_func parse_endpoint); +v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, +struct v4l2_async_notifier *notifier, +size_t asd_struct_size, +parse_endpoint_func parse_endpoint);/* Helper macros to access the connector links. */
Signature · 1 line
2.30.2
kernel test robot
build botRe: [PATCH 3/6] v4l: async: Rename async nf functions, clean up long lines
I love your patch! Yet something to improve:
Hi Sakari,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[cannot apply to rockchip/for-next tegra/for-next v5.13-rc7 next-20210622] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sakari-Ailus/V4L2-driver-documentation-v4l2-async-improvements/20210622-192925 base: git://linuxtv.org/media_tree.git master config: sparc-allyesconfig (attached as .config) compiler: sparc64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/922378435e59e00aef32ba7590991f0e9b24acac
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sakari-Ailus/V4L2-driver-documentation-v4l2-async-improvements/20210622-192925 git checkout 922378435e59e00aef32ba7590991f0e9b24acac
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sparc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/media/platform/atmel/atmel-sama7g5-isc.c: In function 'microchip_xisc_probe':
>> drivers/media/platform/atmel/atmel-sama7g5-isc.c:511:9: error: implicit declaration of function 'v4l2_async_nf_add_fwnode_remote_subdev'; did you mean 'v4l2_async_nf_add_fwnode_remote'? [-Werror=implicit-function-declaration]
511 | asd = v4l2_async_nf_add_fwnode_remote_subdev(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| v4l2_async_nf_add_fwnode_remote
>> drivers/media/platform/atmel/atmel-sama7g5-isc.c:514:6: error: expected expression before 'struct'
514 | struct v4l2_async_subdev);
| ^~~~~~cc1: some warnings being treated as errors
vim +511 drivers/media/platform/atmel/atmel-sama7g5-isc.c
373
374 static int microchip_xisc_probe(struct platform_device *pdev)
375 {
376 struct device *dev = &pdev->dev;
377 struct isc_device *isc;
378 struct resource *res;
379 void __iomem *io_base;
380 struct isc_subdev_entity *subdev_entity;
381 int irq;
382 int ret;
383 u32 ver;
384
385 isc = devm_kzalloc(dev, sizeof(*isc), GFP_KERNEL);
386 if (!isc)
387 return -ENOMEM;
388
389 platform_set_drvdata(pdev, isc);
390 isc->dev = dev;
391
392 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
393 io_base = devm_ioremap_resource(dev, res);
394 if (IS_ERR(io_base))
395 return PTR_ERR(io_base);
396
397 isc->regmap = devm_regmap_init_mmio(dev, io_base, &isc_regmap_config);
398 if (IS_ERR(isc->regmap)) {
399 ret = PTR_ERR(isc->regmap);
400 dev_err(dev, "failed to init register map: %d\n", ret);
401 return ret;
402 }
403
404 irq = platform_get_irq(pdev, 0);
405 if (irq < 0)
406 return irq;
407
408 ret = devm_request_irq(dev, irq, isc_interrupt, 0,
409 "microchip-sama7g5-xisc", isc);
410 if (ret < 0) {
411 dev_err(dev, "can't register ISR for IRQ %u (ret=%i)\n",
412 irq, ret);
413 return ret;
414 }
415
416 isc->gamma_table = isc_sama7g5_gamma_table;
417 isc->gamma_max = 0;
418
419 isc->max_width = ISC_SAMA7G5_MAX_SUPPORT_WIDTH;
420 isc->max_height = ISC_SAMA7G5_MAX_SUPPORT_HEIGHT;
421
422 isc->config_dpc = isc_sama7g5_config_dpc;
423 isc->config_csc = isc_sama7g5_config_csc;
424 isc->config_cbc = isc_sama7g5_config_cbc;
425 isc->config_cc = isc_sama7g5_config_cc;
426 isc->config_gam = isc_sama7g5_config_gam;
427 isc->config_rlp = isc_sama7g5_config_rlp;
428 isc->config_ctrls = isc_sama7g5_config_ctrls;
429
430 isc->adapt_pipeline = isc_sama7g5_adapt_pipeline;
431
432 isc->offsets.csc = ISC_SAMA7G5_CSC_OFFSET;
433 isc->offsets.cbc = ISC_SAMA7G5_CBC_OFFSET;
434 isc->offsets.sub422 = ISC_SAMA7G5_SUB422_OFFSET;
435 isc->offsets.sub420 = ISC_SAMA7G5_SUB420_OFFSET;
436 isc->offsets.rlp = ISC_SAMA7G5_RLP_OFFSET;
437 isc->offsets.his = ISC_SAMA7G5_HIS_OFFSET;
438 isc->offsets.dma = ISC_SAMA7G5_DMA_OFFSET;
439 isc->offsets.version = ISC_SAMA7G5_VERSION_OFFSET;
440 isc->offsets.his_entry = ISC_SAMA7G5_HIS_ENTRY_OFFSET;
441
442 isc->controller_formats = sama7g5_controller_formats;
443 isc->controller_formats_size = ARRAY_SIZE(sama7g5_controller_formats);
444 isc->formats_list = sama7g5_formats_list;
445 isc->formats_list_size = ARRAY_SIZE(sama7g5_formats_list);
446
447 /* sama7g5-isc RAM access port is full AXI4 - 32 bits per beat */
448 isc->dcfg = ISC_DCFG_YMBSIZE_BEATS32 | ISC_DCFG_CMBSIZE_BEATS32;
449
450 ret = isc_pipeline_init(isc);
451 if (ret)
452 return ret;
453
454 isc->hclock = devm_clk_get(dev, "hclock");
455 if (IS_ERR(isc->hclock)) {
456 ret = PTR_ERR(isc->hclock);
457 dev_err(dev, "failed to get hclock: %d\n", ret);
458 return ret;
459 }
460
461 ret = clk_prepare_enable(isc->hclock);
462 if (ret) {
463 dev_err(dev, "failed to enable hclock: %d\n", ret);
464 return ret;
465 }
466
467 ret = isc_clk_init(isc);
468 if (ret) {
469 dev_err(dev, "failed to init isc clock: %d\n", ret);
470 goto unprepare_hclk;
471 }
472
473 isc->ispck = isc->isc_clks[ISC_ISPCK].clk;
474
475 ret = clk_prepare_enable(isc->ispck);
476 if (ret) {
477 dev_err(dev, "failed to enable ispck: %d\n", ret);
478 goto unprepare_hclk;
479 }
480
481 /* ispck should be greater or equal to hclock */
482 ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));
483 if (ret) {
484 dev_err(dev, "failed to set ispck rate: %d\n", ret);
485 goto unprepare_clk;
486 }
487
488 ret = v4l2_device_register(dev, &isc->v4l2_dev);
489 if (ret) {
490 dev_err(dev, "unable to register v4l2 device.\n");
491 goto unprepare_clk;
492 }
493
494 ret = xisc_parse_dt(dev, isc);
495 if (ret) {
496 dev_err(dev, "fail to parse device tree\n");
497 goto unregister_v4l2_device;
498 }
499
500 if (list_empty(&isc->subdev_entities)) {
501 dev_err(dev, "no subdev found\n");
502 ret = -ENODEV;
503 goto unregister_v4l2_device;
504 }
505
506 list_for_each_entry(subdev_entity, &isc->subdev_entities, list) {
507 struct v4l2_async_subdev *asd;
508
509 v4l2_async_nf_init(&subdev_entity->notifier);
510
> 511 asd = v4l2_async_nf_add_fwnode_remote_subdev( 512 &subdev_entity->notifier, 513 of_fwnode_handle(subdev_entity->epn), > 514 struct v4l2_async_subdev);
515
516 of_node_put(subdev_entity->epn);
517 subdev_entity->epn = NULL;
518
519 if (IS_ERR(asd)) {
520 ret = PTR_ERR(asd);
521 goto cleanup_subdev;
522 }
523
524 subdev_entity->notifier.ops = &isc_async_ops;
525
526 ret = v4l2_async_nf_register(&isc->v4l2_dev,
527 &subdev_entity->notifier);
528 if (ret) {
529 dev_err(dev, "fail to register async notifier\n");
530 goto cleanup_subdev;
531 }
532
533 if (video_is_registered(&isc->video_dev))
534 break;
535 }
536
537 pm_runtime_set_active(dev);
538 pm_runtime_enable(dev);
539 pm_request_idle(dev);
540
541 regmap_read(isc->regmap, ISC_VERSION + isc->offsets.version, &ver);
542 dev_info(dev, "Microchip XISC version %x\n", ver);
543
544 return 0;
545
546 cleanup_subdev:
547 isc_subdev_cleanup(isc);
548
549 unregister_v4l2_device:
550 v4l2_device_unregister(&isc->v4l2_dev);
551
552 unprepare_clk:
553 clk_disable_unprepare(isc->ispck);
554 unprepare_hclk:
555 clk_disable_unprepare(isc->hclock);
556
557 isc_clk_cleanup(isc);
558
559 return ret;
560 }
561
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH 3/6] v4l: async: Rename async nf functions, clean up long lines
In reply to Sakari AilusI love your patch! Yet something to improve:
Hi Sakari,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[cannot apply to rockchip/for-next tegra/for-next v5.13-rc7 next-20210622] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sakari-Ailus/V4L2-driver-documentation-v4l2-async-improvements/20210622-192925 base: git://linuxtv.org/media_tree.git master config: arm64-randconfig-r003-20210622 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project b3634d3e88b7f26534a5057bff182b7dced584fc)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/922378435e59e00aef32ba7590991f0e9b24acac
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sakari-Ailus/V4L2-driver-documentation-v4l2-async-improvements/20210622-192925 git checkout 922378435e59e00aef32ba7590991f0e9b24acac
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/media/platform/atmel/atmel-sama7g5-isc.c:511:9: error: implicit declaration of function 'v4l2_async_nf_add_fwnode_remote_subdev' [-Werror,-Wimplicit-function-declaration]
asd = v4l2_async_nf_add_fwnode_remote_subdev(
^
drivers/media/platform/atmel/atmel-sama7g5-isc.c:511:9: note: did you mean '__v4l2_async_nf_add_fwnode_remote'?
include/media/v4l2-async.h:182:1: note: '__v4l2_async_nf_add_fwnode_remote' declared here
__v4l2_async_nf_add_fwnode_remote(struct v4l2_async_notifier *notif,
^
>> drivers/media/platform/atmel/atmel-sama7g5-isc.c:514:6: error: expected expression
struct v4l2_async_subdev);
^2 errors generated.
vim +/v4l2_async_nf_add_fwnode_remote_subdev +511 drivers/media/platform/atmel/atmel-sama7g5-isc.c
373
374 static int microchip_xisc_probe(struct platform_device *pdev)
375 {
376 struct device *dev = &pdev->dev;
377 struct isc_device *isc;
378 struct resource *res;
379 void __iomem *io_base;
380 struct isc_subdev_entity *subdev_entity;
381 int irq;
382 int ret;
383 u32 ver;
384
385 isc = devm_kzalloc(dev, sizeof(*isc), GFP_KERNEL);
386 if (!isc)
387 return -ENOMEM;
388
389 platform_set_drvdata(pdev, isc);
390 isc->dev = dev;
391
392 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
393 io_base = devm_ioremap_resource(dev, res);
394 if (IS_ERR(io_base))
395 return PTR_ERR(io_base);
396
397 isc->regmap = devm_regmap_init_mmio(dev, io_base, &isc_regmap_config);
398 if (IS_ERR(isc->regmap)) {
399 ret = PTR_ERR(isc->regmap);
400 dev_err(dev, "failed to init register map: %d\n", ret);
401 return ret;
402 }
403
404 irq = platform_get_irq(pdev, 0);
405 if (irq < 0)
406 return irq;
407
408 ret = devm_request_irq(dev, irq, isc_interrupt, 0,
409 "microchip-sama7g5-xisc", isc);
410 if (ret < 0) {
411 dev_err(dev, "can't register ISR for IRQ %u (ret=%i)\n",
412 irq, ret);
413 return ret;
414 }
415
416 isc->gamma_table = isc_sama7g5_gamma_table;
417 isc->gamma_max = 0;
418
419 isc->max_width = ISC_SAMA7G5_MAX_SUPPORT_WIDTH;
420 isc->max_height = ISC_SAMA7G5_MAX_SUPPORT_HEIGHT;
421
422 isc->config_dpc = isc_sama7g5_config_dpc;
423 isc->config_csc = isc_sama7g5_config_csc;
424 isc->config_cbc = isc_sama7g5_config_cbc;
425 isc->config_cc = isc_sama7g5_config_cc;
426 isc->config_gam = isc_sama7g5_config_gam;
427 isc->config_rlp = isc_sama7g5_config_rlp;
428 isc->config_ctrls = isc_sama7g5_config_ctrls;
429
430 isc->adapt_pipeline = isc_sama7g5_adapt_pipeline;
431
432 isc->offsets.csc = ISC_SAMA7G5_CSC_OFFSET;
433 isc->offsets.cbc = ISC_SAMA7G5_CBC_OFFSET;
434 isc->offsets.sub422 = ISC_SAMA7G5_SUB422_OFFSET;
435 isc->offsets.sub420 = ISC_SAMA7G5_SUB420_OFFSET;
436 isc->offsets.rlp = ISC_SAMA7G5_RLP_OFFSET;
437 isc->offsets.his = ISC_SAMA7G5_HIS_OFFSET;
438 isc->offsets.dma = ISC_SAMA7G5_DMA_OFFSET;
439 isc->offsets.version = ISC_SAMA7G5_VERSION_OFFSET;
440 isc->offsets.his_entry = ISC_SAMA7G5_HIS_ENTRY_OFFSET;
441
442 isc->controller_formats = sama7g5_controller_formats;
443 isc->controller_formats_size = ARRAY_SIZE(sama7g5_controller_formats);
444 isc->formats_list = sama7g5_formats_list;
445 isc->formats_list_size = ARRAY_SIZE(sama7g5_formats_list);
446
447 /* sama7g5-isc RAM access port is full AXI4 - 32 bits per beat */
448 isc->dcfg = ISC_DCFG_YMBSIZE_BEATS32 | ISC_DCFG_CMBSIZE_BEATS32;
449
450 ret = isc_pipeline_init(isc);
451 if (ret)
452 return ret;
453
454 isc->hclock = devm_clk_get(dev, "hclock");
455 if (IS_ERR(isc->hclock)) {
456 ret = PTR_ERR(isc->hclock);
457 dev_err(dev, "failed to get hclock: %d\n", ret);
458 return ret;
459 }
460
461 ret = clk_prepare_enable(isc->hclock);
462 if (ret) {
463 dev_err(dev, "failed to enable hclock: %d\n", ret);
464 return ret;
465 }
466
467 ret = isc_clk_init(isc);
468 if (ret) {
469 dev_err(dev, "failed to init isc clock: %d\n", ret);
470 goto unprepare_hclk;
471 }
472
473 isc->ispck = isc->isc_clks[ISC_ISPCK].clk;
474
475 ret = clk_prepare_enable(isc->ispck);
476 if (ret) {
477 dev_err(dev, "failed to enable ispck: %d\n", ret);
478 goto unprepare_hclk;
479 }
480
481 /* ispck should be greater or equal to hclock */
482 ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));
483 if (ret) {
484 dev_err(dev, "failed to set ispck rate: %d\n", ret);
485 goto unprepare_clk;
486 }
487
488 ret = v4l2_device_register(dev, &isc->v4l2_dev);
489 if (ret) {
490 dev_err(dev, "unable to register v4l2 device.\n");
491 goto unprepare_clk;
492 }
493
494 ret = xisc_parse_dt(dev, isc);
495 if (ret) {
496 dev_err(dev, "fail to parse device tree\n");
497 goto unregister_v4l2_device;
498 }
499
500 if (list_empty(&isc->subdev_entities)) {
501 dev_err(dev, "no subdev found\n");
502 ret = -ENODEV;
503 goto unregister_v4l2_device;
504 }
505
506 list_for_each_entry(subdev_entity, &isc->subdev_entities, list) {
507 struct v4l2_async_subdev *asd;
508
509 v4l2_async_nf_init(&subdev_entity->notifier);
510
> 511 asd = v4l2_async_nf_add_fwnode_remote_subdev( 512 &subdev_entity->notifier, 513 of_fwnode_handle(subdev_entity->epn), > 514 struct v4l2_async_subdev);
515
516 of_node_put(subdev_entity->epn);
517 subdev_entity->epn = NULL;
518
519 if (IS_ERR(asd)) {
520 ret = PTR_ERR(asd);
521 goto cleanup_subdev;
522 }
523
524 subdev_entity->notifier.ops = &isc_async_ops;
525
526 ret = v4l2_async_nf_register(&isc->v4l2_dev,
527 &subdev_entity->notifier);
528 if (ret) {
529 dev_err(dev, "fail to register async notifier\n");
530 goto cleanup_subdev;
531 }
532
533 if (video_is_registered(&isc->video_dev))
534 break;
535 }
536
537 pm_runtime_set_active(dev);
538 pm_runtime_enable(dev);
539 pm_request_idle(dev);
540
541 regmap_read(isc->regmap, ISC_VERSION + isc->offsets.version, &ver);
542 dev_info(dev, "Microchip XISC version %x\n", ver);
543
544 return 0;
545
546 cleanup_subdev:
547 isc_subdev_cleanup(isc);
548
549 unregister_v4l2_device:
550 v4l2_device_unregister(&isc->v4l2_dev);
551
552 unprepare_clk:
553 clk_disable_unprepare(isc->ispck);
554 unprepare_hclk:
555 clk_disable_unprepare(isc->hclock);
556
557 isc_clk_cleanup(isc);
558
559 return ret;
560 }
561
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Sakari Ailus
maintainerPATCH v2 3/6 v4l: async: Rename async nf functions, clean up long lines
In reply to Sakari AilusRename V4L2 async notifier functions, replacing "notifier" with "nf" and removing "_subdev" at the end of the function names adding subdevs as you can only add subdevs to a notifier. Also wrap and otherwise clean up long lines.
---
since v1:
- Fix compile error in atmel-sama7g5-isc.c.
.../driver-api/media/v4l2-subdev.rst | 14 +- drivers/media/i2c/max9286.c | 17 +- drivers/media/i2c/st-mipid02.c | 22 ++- drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 17 +- drivers/media/platform/am437x/am437x-vpfe.c | 19 +- drivers/media/platform/atmel/atmel-isc-base.c | 4 +- drivers/media/platform/atmel/atmel-isi.c | 17 +- .../media/platform/atmel/atmel-sama5d2-isc.c | 15 +- .../media/platform/atmel/atmel-sama7g5-isc.c | 14 +- drivers/media/platform/cadence/cdns-csi2rx.c | 14 +- drivers/media/platform/davinci/vpif_capture.c | 21 +-- drivers/media/platform/exynos4-is/media-dev.c | 20 +-- .../media/platform/marvell-ccic/cafe-driver.c | 9 +- .../media/platform/marvell-ccic/mcam-core.c | 10 +- .../media/platform/marvell-ccic/mmp-driver.c | 6 +- drivers/media/platform/omap3isp/isp.c | 21 ++- drivers/media/platform/pxa_camera.c | 26 ++- drivers/media/platform/qcom/camss/camss.c | 18 +- drivers/media/platform/rcar-vin/rcar-core.c | 34 ++-- drivers/media/platform/rcar-vin/rcar-csi2.c | 19 +- drivers/media/platform/rcar_drif.c | 14 +- drivers/media/platform/renesas-ceu.c | 29 ++- .../platform/rockchip/rkisp1/rkisp1-dev.c | 17 +- drivers/media/platform/stm32/stm32-dcmi.c | 18 +- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 12 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 19 +- drivers/media/platform/ti-vpe/cal.c | 16 +- drivers/media/platform/video-mux.c | 17 +- drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- drivers/media/v4l2-core/v4l2-async.c | 168 +++++++++--------- drivers/media/v4l2-core/v4l2-fwnode.c | 74 ++++---- drivers/staging/media/imx/imx-media-csi.c | 17 +- .../staging/media/imx/imx-media-dev-common.c | 7 +- drivers/staging/media/imx/imx-media-dev.c | 6 +- drivers/staging/media/imx/imx-media-of.c | 6 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +- drivers/staging/media/imx/imx7-media-csi.c | 24 +-- drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- drivers/staging/media/tegra-video/vi.c | 17 +- include/media/v4l2-async.h | 105 ++++++----- include/media/v4l2-fwnode.h | 12 +- 41 files changed, 472 insertions(+), 493 deletions(-)
Documentation/driver-api/media/v4l2-subdev.rst +7 -7
@@ -191,21 +191,21 @@ registered this way are stored in a global list of subdevices, ready to be picked up by bridge drivers. Bridge drivers in turn have to register a notifier object. This is -performed using the :c:func:`v4l2_async_notifier_register` call. To +performed using the :c:func:`v4l2_async_nf_register` call. To unregister the notifier the driver has to call -:c:func:`v4l2_async_notifier_unregister`. The former of the two functions +:c:func:`v4l2_async_nf_unregister`. The former of the two functions takes two arguments: a pointer to struct :c:type:`v4l2_device` and a pointer to struct :c:type:`v4l2_async_notifier`. Before registering the notifier, bridge drivers must do two things: first, the -notifier must be initialized using the :c:func:`v4l2_async_notifier_init`. +notifier must be initialized using the :c:func:`v4l2_async_nf_init`. Second, bridge drivers can then begin to form a list of subdevice descriptors that the bridge device needs for its operation. Several functions are available to add subdevice descriptors to a notifier, depending on the type of device and the needs of the driver. -:c:func:`v4l2_async_notifier_add_fwnode_remote_subdev` and -:c:func:`v4l2_async_notifier_add_i2c_subdev` are for bridge and ISP drivers for +:c:func:`v4l2_async_nf_add_fwnode_remote` and +:c:func:`v4l2_async_nf_add_i2c` are for bridge and ISP drivers for registering their async sub-devices with the notifier. :c:func:`v4l2_async_register_subdev_sensor` is a helper function for
@@ -230,8 +230,8 @@ These functions allocate an async sub-device descriptor which is of type struct ... - my_asd = v4l2_async_notifier_add_fwnode_remote_subdev(¬ifier, ep, - struct my_async_subdev); + my_asd = v4l2_async_nf_add_fwnode_remote(¬ifier, ep, + struct my_async_subdev); fwnode_handle_put(ep); if (IS_ERR(asd))
drivers/media/i2c/max9286.c +8 -9
@@ -606,19 +606,18 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv)if (!priv->nsources)return 0 ; -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier);for_each_source (priv, source) {unsigned int i =to_index (priv, source);struct max9286_asd *mas; - mas =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, - source->fwnode, - struct max9286_asd); + mas =v4l2_async_nf_add_fwnode (&priv->notifier, source->fwnode, + struct max9286_asd);if (IS_ERR (mas)) {dev_err (dev,"Failed to add subdev for source %u: %ld" , i,PTR_ERR (mas)); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return PTR_ERR (mas); }
@@ -627,10 +626,10 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv) priv->notifier.ops = &max9286_notify_ops; - ret =v4l2_async_subdev_notifier_register (&priv->sd, &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier);if (ret) {dev_err (dev,"Failed to register subdev_notifier" ); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -642,8 +641,8 @@ static void max9286_v4l2_notifier_unregister(struct max9286_priv *priv)if (!priv->nsources)return ; -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier); }static int max9286_s_stream (struct v4l2_subdev *sd,int enable)
drivers/media/i2c/st-mipid02.c +10 -12
@@ -876,11 +876,10 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) bridge->rx = ep;/* register async notifier so we get noticed when sensor is connected */ -v4l2_async_notifier_init (&bridge->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &bridge->notifier, -of_fwnode_handle (ep_node), - struct v4l2_async_subdev); +v4l2_async_nf_init (&bridge->notifier); + asd =v4l2_async_nf_add_fwnode_remote (&bridge->notifier, +of_fwnode_handle (ep_node), + struct v4l2_async_subdev);of_node_put (ep_node);if (IS_ERR (asd)) {
@@ -890,10 +889,9 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) } bridge->notifier.ops = &mipid02_notifier_ops; - ret =v4l2_async_subdev_notifier_register (&bridge->sd, - &bridge->notifier); + ret =v4l2_async_subdev_nf_register (&bridge->sd, &bridge->notifier);if (ret) -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier);return ret;
@@ -1031,8 +1029,8 @@ static int mipid02_probe(struct i2c_client *client)return 0 ; unregister_notifier: -v4l2_async_notifier_unregister (&bridge->notifier); -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_unregister (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier); power_off:mipid02_set_power_off (bridge); entity_cleanup:
@@ -1048,8 +1046,8 @@ static int mipid02_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct mipid02_dev *bridge =to_mipid02_dev (sd); -v4l2_async_notifier_unregister (&bridge->notifier); -v4l2_async_notifier_cleanup (&bridge->notifier); +v4l2_async_nf_unregister (&bridge->notifier); +v4l2_async_nf_cleanup (&bridge->notifier);v4l2_async_unregister_subdev (&bridge->sd);mipid02_set_power_off (bridge);media_entity_cleanup (&bridge->sd.entity);
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +9 -8
@@ -1478,8 +1478,9 @@ static int cio2_parse_firmware(struct cio2_device *cio2)if (ret) goto err_parse; - s_asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &cio2->notifier, ep, struct sensor_async_subdev); + s_asd =v4l2_async_nf_add_fwnode_remote (&cio2->notifier, ep, + struct + sensor_async_subdev);if (IS_ERR (s_asd)) { ret =PTR_ERR (s_asd); goto err_parse;
@@ -1502,7 +1503,7 @@ static int cio2_parse_firmware(struct cio2_device *cio2)* suspend. */ cio2->notifier.ops = &cio2_async_ops; - ret =v4l2_async_notifier_register (&cio2->v4l2_dev, &cio2->notifier); + ret =v4l2_async_nf_register (&cio2->v4l2_dev, &cio2->notifier);if (ret)dev_err (&cio2->pci_dev->dev,"failed to register async notifier : %d\n" , ret);
@@ -1804,7 +1805,7 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,if (r) goto fail_v4l2_device_unregister; -v4l2_async_notifier_init (&cio2->notifier); +v4l2_async_nf_init (&cio2->notifier);/* Register notifier for subdevices we care */ r =cio2_parse_firmware (cio2);
@@ -1824,8 +1825,8 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,return 0 ; fail_clean_notifier: -v4l2_async_notifier_unregister (&cio2->notifier); -v4l2_async_notifier_cleanup (&cio2->notifier); +v4l2_async_nf_unregister (&cio2->notifier); +v4l2_async_nf_cleanup (&cio2->notifier);cio2_queues_exit (cio2); fail_v4l2_device_unregister:v4l2_device_unregister (&cio2->v4l2_dev);
@@ -1844,8 +1845,8 @@ static void cio2_pci_remove(struct pci_dev *pci_dev)struct cio2_device *cio2 =pci_get_drvdata (pci_dev);media_device_unregister (&cio2->media_dev); -v4l2_async_notifier_unregister (&cio2->notifier); -v4l2_async_notifier_cleanup (&cio2->notifier); +v4l2_async_nf_unregister (&cio2->notifier); +v4l2_async_nf_cleanup (&cio2->notifier);cio2_queues_exit (cio2);cio2_fbpt_exit_dummy (cio2);v4l2_device_unregister (&cio2->v4l2_dev);
drivers/media/platform/am437x/am437x-vpfe.c +10 -9
@@ -2297,7 +2297,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe)dev_dbg (dev,"vpfe_get_pdata\n" ); -v4l2_async_notifier_init (&vpfe->notifier); +v4l2_async_nf_init (&vpfe->notifier);if (!IS_ENABLED (CONFIG_OF ) || !dev->of_node)return dev->platform_data;
@@ -2365,9 +2365,10 @@ vpfe_get_pdata(struct vpfe_device *vpfe) goto cleanup; } - pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( - &vpfe->notifier,of_fwnode_handle (rem), - struct v4l2_async_subdev); + pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpfe->notifier, +of_fwnode_handle (rem), + struct + v4l2_async_subdev);of_node_put (rem);if (IS_ERR (pdata->asd[i])) goto cleanup;
@@ -2377,7 +2378,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe)return pdata; cleanup: -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);of_node_put (endpoint);return NULL ; }
@@ -2465,7 +2466,7 @@ static int vpfe_probe(struct platform_device *pdev) } vpfe->notifier.ops = &vpfe_async_ops; - ret =v4l2_async_notifier_register (&vpfe->v4l2_dev, &vpfe->notifier); + ret =v4l2_async_nf_register (&vpfe->v4l2_dev, &vpfe->notifier);if (ret) {vpfe_err (vpfe,"Error registering async notifier\n" ); ret = -EINVAL ;
@@ -2477,7 +2478,7 @@ static int vpfe_probe(struct platform_device *pdev) probe_out_v4l2_unregister:v4l2_device_unregister (&vpfe->v4l2_dev); probe_out_cleanup: -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);return ret; }
@@ -2490,8 +2491,8 @@ static int vpfe_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&vpfe->notifier); -v4l2_async_notifier_cleanup (&vpfe->notifier); +v4l2_async_nf_unregister (&vpfe->notifier); +v4l2_async_nf_cleanup (&vpfe->notifier);v4l2_device_unregister (&vpfe->v4l2_dev);video_unregister_device (&vpfe->video_dev);
drivers/media/platform/atmel/atmel-isc-base.c +2 -2
@@ -2218,8 +2218,8 @@ void isc_subdev_cleanup(struct isc_device *isc)struct isc_subdev_entity *subdev_entity;list_for_each_entry (subdev_entity, &isc->subdev_entities, list) { -v4l2_async_notifier_unregister (&subdev_entity->notifier); -v4l2_async_notifier_cleanup (&subdev_entity->notifier); +v4l2_async_nf_unregister (&subdev_entity->notifier); +v4l2_async_nf_cleanup (&subdev_entity->notifier); }INIT_LIST_HEAD (&isc->subdev_entities);
drivers/media/platform/atmel/atmel-isi.c +8 -9
@@ -1159,12 +1159,11 @@ static int isi_graph_init(struct atmel_isi *isi)if (!ep)return -EINVAL ; -v4l2_async_notifier_init (&isi->notifier); +v4l2_async_nf_init (&isi->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isi->notifier, -of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&isi->notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))
@@ -1172,10 +1171,10 @@ static int isi_graph_init(struct atmel_isi *isi) isi->notifier.ops = &isi_graph_notify_ops; - ret =v4l2_async_notifier_register (&isi->v4l2_dev, &isi->notifier); + ret =v4l2_async_nf_register (&isi->v4l2_dev, &isi->notifier);if (ret <0 ) {dev_err (isi->dev,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&isi->notifier); +v4l2_async_nf_cleanup (&isi->notifier);return ret; }
@@ -1327,8 +1326,8 @@ static int atmel_isi_remove(struct platform_device *pdev) isi->p_fb_descriptors, isi->fb_descriptors_phys);pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&isi->notifier); -v4l2_async_notifier_cleanup (&isi->notifier); +v4l2_async_nf_unregister (&isi->notifier); +v4l2_async_nf_cleanup (&isi->notifier);v4l2_device_unregister (&isi->v4l2_dev);return 0 ;
drivers/media/platform/atmel/atmel-sama5d2-isc.c +8 -7
@@ -495,13 +495,14 @@ static int atmel_isc_probe(struct platform_device *pdev)list_for_each_entry (subdev_entity, &isc->subdev_entities, list) {struct v4l2_async_subdev *asd; +struct fwnode_handle *fwnode = +of_fwnode_handle (subdev_entity->epn); -v4l2_async_notifier_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &subdev_entity->notifier, -of_fwnode_handle (subdev_entity->epn), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, + fwnode, + struct v4l2_async_subdev);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
@@ -513,8 +514,8 @@ static int atmel_isc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &isc_async_ops; - ret =v4l2_async_notifier_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&isc->v4l2_dev, + &subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/atmel/atmel-sama7g5-isc.c +7 -7
@@ -505,13 +505,13 @@ static int microchip_xisc_probe(struct platform_device *pdev)list_for_each_entry (subdev_entity, &isc->subdev_entities, list) {struct v4l2_async_subdev *asd; + struct *fwnode = of_fwnode_handle(subdev_entity->epn); -v4l2_async_notifier_init (&subdev_entity->notifier); +v4l2_async_nf_init (&subdev_entity->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &subdev_entity->notifier, -of_fwnode_handle (subdev_entity->epn), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&subdev_entity->notifier, + fwnode, + struct v4l2_async_subdev);of_node_put (subdev_entity->epn); subdev_entity->epn =NULL ;
@@ -523,8 +523,8 @@ static int microchip_xisc_probe(struct platform_device *pdev) subdev_entity->notifier.ops = &isc_async_ops; - ret =v4l2_async_notifier_register (&isc->v4l2_dev, - &subdev_entity->notifier); + ret =v4l2_async_nf_register (&isc->v4l2_dev, + &subdev_entity->notifier);if (ret) {dev_err (dev,"fail to register async notifier\n" ); goto cleanup_subdev;
drivers/media/platform/cadence/cdns-csi2rx.c +6 -8
@@ -401,21 +401,19 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)return -EINVAL ; } -v4l2_async_notifier_init (&csi2rx->notifier); +v4l2_async_nf_init (&csi2rx->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev (&csi2rx->notifier, - fwh, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi2rx->notifier, fwh, + struct v4l2_async_subdev);of_node_put (ep);if (IS_ERR (asd))return PTR_ERR (asd); csi2rx->notifier.ops = &csi2rx_notifier_ops; - ret =v4l2_async_subdev_notifier_register (&csi2rx->subdev, - &csi2rx->notifier); + ret =v4l2_async_subdev_nf_register (&csi2rx->subdev, &csi2rx->notifier);if (ret) -v4l2_async_notifier_cleanup (&csi2rx->notifier); +v4l2_async_nf_cleanup (&csi2rx->notifier);return ret; }
@@ -471,7 +469,7 @@ static int csi2rx_probe(struct platform_device *pdev)return 0 ; err_cleanup: -v4l2_async_notifier_cleanup (&csi2rx->notifier); +v4l2_async_nf_cleanup (&csi2rx->notifier); err_free_priv:kfree (csi2rx);return ret;
drivers/media/platform/davinci/vpif_capture.c +11 -10
@@ -1506,7 +1506,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)struct vpif_capture_chan_config *chan;unsigned int i; -v4l2_async_notifier_init (&vpif_obj.notifier); +v4l2_async_nf_init (&vpif_obj.notifier);/* * DT boot: OF node from parent device contains
@@ -1582,9 +1582,10 @@ vpif_capture_get_pdata(struct platform_device *pdev)dev_dbg (&pdev->dev,"Remote device %pOF found\n" , rem); sdinfo->name = rem->full_name; - pdata->asd[i] =v4l2_async_notifier_add_fwnode_subdev ( - &vpif_obj.notifier,of_fwnode_handle (rem), - struct v4l2_async_subdev); + pdata->asd[i] =v4l2_async_nf_add_fwnode (&vpif_obj.notifier, +of_fwnode_handle (rem), + struct + v4l2_async_subdev);if (IS_ERR (pdata->asd[i])) goto err_cleanup;
@@ -1602,7 +1603,7 @@ vpif_capture_get_pdata(struct platform_device *pdev) err_cleanup:of_node_put (rem);of_node_put (endpoint); -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);return NULL ; }
@@ -1692,8 +1693,8 @@ static __init int vpif_probe(struct platform_device *pdev) goto probe_subdev_out; }else { vpif_obj.notifier.ops = &vpif_async_ops; - err =v4l2_async_notifier_register (&vpif_obj.v4l2_dev, - &vpif_obj.notifier); + err =v4l2_async_nf_register (&vpif_obj.v4l2_dev, + &vpif_obj.notifier);if (err) {vpif_err ("Error registering async notifier\n" ); err = -EINVAL ;
@@ -1711,7 +1712,7 @@ static __init int vpif_probe(struct platform_device *pdev) vpif_free:free_vpif_objs (); cleanup: -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);return err; }
@@ -1727,8 +1728,8 @@ static int vpif_remove(struct platform_device *device)struct channel_obj *ch;int i; -v4l2_async_notifier_unregister (&vpif_obj.notifier); -v4l2_async_notifier_cleanup (&vpif_obj.notifier); +v4l2_async_nf_unregister (&vpif_obj.notifier); +v4l2_async_nf_cleanup (&vpif_obj.notifier);v4l2_device_unregister (&vpif_obj.v4l2_dev);kfree (vpif_obj.sd);
drivers/media/platform/exynos4-is/media-dev.c +10 -10
@@ -464,9 +464,9 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,return -EINVAL ; } - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &fmd->subdev_notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&fmd->subdev_notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);
@@ -557,7 +557,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd) cleanup:of_node_put (ports); -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier);pm_runtime_put (fmd->pmf);return ret; }
@@ -1482,7 +1482,7 @@ static int fimc_md_probe(struct platform_device *pdev)platform_set_drvdata (pdev, fmd); -v4l2_async_notifier_init (&fmd->subdev_notifier); +v4l2_async_nf_init (&fmd->subdev_notifier); ret =fimc_md_register_platform_entities (fmd, dev->of_node);if (ret)
@@ -1510,8 +1510,8 @@ static int fimc_md_probe(struct platform_device *pdev) fmd->subdev_notifier.ops = &subdev_notifier_ops; fmd->num_sensors =0 ; - ret =v4l2_async_notifier_register (&fmd->v4l2_dev, - &fmd->subdev_notifier); + ret =v4l2_async_nf_register (&fmd->v4l2_dev, + &fmd->subdev_notifier);if (ret) goto err_clk_p; }
@@ -1523,7 +1523,7 @@ static int fimc_md_probe(struct platform_device *pdev) err_attr:device_remove_file (&pdev->dev, &dev_attr_subdev_conf_mode); err_cleanup: -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier); err_m_ent:fimc_md_unregister_entities (fmd); err_clk:
@@ -1543,8 +1543,8 @@ static int fimc_md_remove(struct platform_device *pdev)return 0 ;fimc_md_unregister_clk_provider (fmd); -v4l2_async_notifier_unregister (&fmd->subdev_notifier); -v4l2_async_notifier_cleanup (&fmd->subdev_notifier); +v4l2_async_nf_unregister (&fmd->subdev_notifier); +v4l2_async_nf_cleanup (&fmd->subdev_notifier);v4l2_device_unregister (&fmd->v4l2_dev);device_remove_file (&pdev->dev, &dev_attr_subdev_conf_mode);
drivers/media/platform/marvell-ccic/cafe-driver.c +4 -5
@@ -544,12 +544,11 @@ static int cafe_pci_probe(struct pci_dev *pdev,if (ret) goto out_pdown; -v4l2_async_notifier_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier); - asd =v4l2_async_notifier_add_i2c_subdev (&mcam->notifier, -i2c_adapter_id (cam->i2c_adapter), - ov7670_info.addr, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_i2c (&mcam->notifier, +i2c_adapter_id (cam->i2c_adapter), + ov7670_info.addr, struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out_smbus_shutdown;
drivers/media/platform/marvell-ccic/mcam-core.c +5 -5
@@ -1877,7 +1877,7 @@ int mccic_register(struct mcam_camera *cam) cam->mbus_code = mcam_def_mbus_code; cam->notifier.ops = &mccic_notify_ops; - ret =v4l2_async_notifier_register (&cam->v4l2_dev, &cam->notifier); + ret =v4l2_async_nf_register (&cam->v4l2_dev, &cam->notifier);if (ret <0 ) {cam_warn (cam,"failed to register a sensor notifier" ); goto out;
@@ -1914,9 +1914,9 @@ int mccic_register(struct mcam_camera *cam)return 0 ; out: -v4l2_async_notifier_unregister (&cam->notifier); +v4l2_async_nf_unregister (&cam->notifier);v4l2_device_unregister (&cam->v4l2_dev); -v4l2_async_notifier_cleanup (&cam->notifier); +v4l2_async_nf_cleanup (&cam->notifier);return ret; }EXPORT_SYMBOL_GPL (mccic_register);
@@ -1936,9 +1936,9 @@ void mccic_shutdown(struct mcam_camera *cam)if (cam->buffer_mode == B_vmalloc)mcam_free_dma_bufs (cam);v4l2_ctrl_handler_free (&cam->ctrl_handler); -v4l2_async_notifier_unregister (&cam->notifier); +v4l2_async_nf_unregister (&cam->notifier);v4l2_device_unregister (&cam->v4l2_dev); -v4l2_async_notifier_cleanup (&cam->notifier); +v4l2_async_nf_cleanup (&cam->notifier); }EXPORT_SYMBOL_GPL (mccic_shutdown);
drivers/media/platform/marvell-ccic/mmp-driver.c +3 -3
@@ -239,10 +239,10 @@ static int mmpcam_probe(struct platform_device *pdev)if (!ep)return -ENODEV ; -v4l2_async_notifier_init (&mcam->notifier); +v4l2_async_nf_init (&mcam->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev (&mcam->notifier, ep, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&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 +12 -9
@@ -2003,7 +2003,7 @@ static int isp_remove(struct platform_device *pdev) {struct isp_device *isp =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&isp->notifier); +v4l2_async_nf_unregister (&isp->notifier);isp_unregister_entities (isp);isp_cleanup_modules (isp);isp_xclk_cleanup (isp);
@@ -2013,7 +2013,7 @@ static int isp_remove(struct platform_device *pdev)__omap3isp_put (isp, false);media_entity_enum_cleanup (&isp->crashed); -v4l2_async_notifier_cleanup (&isp->notifier); +v4l2_async_nf_cleanup (&isp->notifier);kfree (isp);
@@ -2170,8 +2170,9 @@ static int isp_parse_of_endpoints(struct isp_device *isp) ret =v4l2_fwnode_endpoint_parse (ep, &vep);if (!ret) { - isd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep, struct isp_async_subdev); + isd =v4l2_async_nf_add_fwnode_remote (&isp->notifier, + ep, struct + isp_async_subdev);if (!IS_ERR (isd))isp_parse_of_parallel_endpoint (isp->dev, &vep, &isd->bus); }
@@ -2209,8 +2210,10 @@ static int isp_parse_of_endpoints(struct isp_device *isp) }if (!ret) { - isd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &isp->notifier, ep, struct isp_async_subdev); + isd =v4l2_async_nf_add_fwnode_remote (&isp->notifier, + ep, + struct + isp_async_subdev);if (!IS_ERR (isd)) {switch (vep.bus_type) {
@@ -2287,7 +2290,7 @@ static int isp_probe(struct platform_device *pdev)mutex_init (&isp->isp_mutex);spin_lock_init (&isp->stat_lock); -v4l2_async_notifier_init (&isp->notifier); +v4l2_async_nf_init (&isp->notifier); isp->dev = &pdev->dev; ret =isp_parse_of_endpoints (isp);
@@ -2416,7 +2419,7 @@ static int isp_probe(struct platform_device *pdev) isp->notifier.ops = &isp_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&isp->v4l2_dev, &isp->notifier); + ret =v4l2_async_nf_register (&isp->v4l2_dev, &isp->notifier);if (ret) goto error_register_entities;
@@ -2435,7 +2438,7 @@ static int isp_probe(struct platform_device *pdev)isp_xclk_cleanup (isp);__omap3isp_put (isp, false); error: -v4l2_async_notifier_cleanup (&isp->notifier); +v4l2_async_nf_cleanup (&isp->notifier);mutex_destroy (&isp->isp_mutex); error_release_isp:kfree (isp);
drivers/media/platform/pxa_camera.c +12 -14
@@ -2249,10 +2249,9 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &pcdev->notifier, -of_fwnode_handle (np), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&pcdev->notifier, +of_fwnode_handle (np), + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); out:
@@ -2289,7 +2288,7 @@ 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); +v4l2_async_nf_init (&pcdev->notifier); pcdev->res = res; pcdev->pdata = pdev->dev.platform_data;if (pcdev->pdata) {
@@ -2297,11 +2296,10 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->platform_flags = pcdev->pdata->flags; pcdev->mclk = pcdev->pdata->mclk_10khz *10000 ; - asd =v4l2_async_notifier_add_i2c_subdev ( - &pcdev->notifier, - pcdev->pdata->sensor_i2c_adapter_id, - pcdev->pdata->sensor_i2c_address, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_i2c (&pcdev->notifier, + pcdev->pdata->sensor_i2c_adapter_id, + pcdev->pdata->sensor_i2c_address, + struct v4l2_async_subdev);if (IS_ERR (asd)) err =PTR_ERR (asd); }else if (pdev->dev.of_node) {
@@ -2402,13 +2400,13 @@ static int pxa_camera_probe(struct platform_device *pdev) goto exit_notifier_cleanup; pcdev->notifier.ops = &pxa_camera_sensor_ops; - err =v4l2_async_notifier_register (&pcdev->v4l2_dev, &pcdev->notifier); + err =v4l2_async_nf_register (&pcdev->v4l2_dev, &pcdev->notifier);if (err) goto exit_notifier_cleanup;return 0 ; exit_notifier_cleanup: -v4l2_async_notifier_cleanup (&pcdev->notifier); +v4l2_async_nf_cleanup (&pcdev->notifier);v4l2_device_unregister (&pcdev->v4l2_dev); exit_deactivate:pxa_camera_deactivate (pcdev);
@@ -2432,8 +2430,8 @@ static int pxa_camera_remove(struct platform_device *pdev)dma_release_channel (pcdev->dma_chans[1 ]);dma_release_channel (pcdev->dma_chans[2 ]); -v4l2_async_notifier_unregister (&pcdev->notifier); -v4l2_async_notifier_cleanup (&pcdev->notifier); +v4l2_async_nf_unregister (&pcdev->notifier); +v4l2_async_nf_cleanup (&pcdev->notifier);v4l2_device_unregister (&pcdev->v4l2_dev);
drivers/media/platform/qcom/camss/camss.c +9 -9
@@ -886,9 +886,9 @@ static int camss_of_parse_ports(struct camss *camss) goto err_cleanup; } - csd =v4l2_async_notifier_add_fwnode_subdev ( - &camss->notifier,of_fwnode_handle (remote), - struct camss_async_subdev); + csd =v4l2_async_nf_add_fwnode (&camss->notifier, +of_fwnode_handle (remote), + struct camss_async_subdev);of_node_put (remote);if (IS_ERR (csd)) { ret =PTR_ERR (csd);
@@ -1361,7 +1361,7 @@ static int camss_probe(struct platform_device *pdev) goto err_free; } -v4l2_async_notifier_init (&camss->notifier); +v4l2_async_nf_init (&camss->notifier); num_subdevs =camss_of_parse_ports (camss);if (num_subdevs <0 ) {
@@ -1397,8 +1397,8 @@ static int camss_probe(struct platform_device *pdev)if (num_subdevs) { camss->notifier.ops = &camss_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&camss->v4l2_dev, - &camss->notifier); + ret =v4l2_async_nf_register (&camss->v4l2_dev, + &camss->notifier);if (ret) { dev_err(dev, "Failed to register async subdev nodes: %d\n",
@@ -1436,7 +1436,7 @@ static int camss_probe(struct platform_device *pdev) err_register_entities:v4l2_device_unregister (&camss->v4l2_dev); err_cleanup: -v4l2_async_notifier_cleanup (&camss->notifier); +v4l2_async_nf_cleanup (&camss->notifier); err_free:kfree (camss);
@@ -1478,8 +1478,8 @@ static int camss_remove(struct platform_device *pdev) {struct camss *camss =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&camss->notifier); -v4l2_async_notifier_cleanup (&camss->notifier); +v4l2_async_nf_unregister (&camss->notifier); +v4l2_async_nf_cleanup (&camss->notifier);camss_unregister_entities (camss);if (atomic_read (&camss->ref_count) ==0 )
drivers/media/platform/rcar-vin/rcar-core.c +16 -18
@@ -641,8 +641,8 @@ static int rvin_parallel_parse_of(struct rvin_dev *vin) goto out; } - asd =v4l2_async_notifier_add_fwnode_subdev (&vin->notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&vin->notifier, fwnode, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -661,7 +661,7 @@ static int rvin_parallel_init(struct rvin_dev *vin) {int ret; -v4l2_async_notifier_init (&vin->notifier); +v4l2_async_nf_init (&vin->notifier); ret =rvin_parallel_parse_of (vin);if (ret)
@@ -675,10 +675,10 @@ static int rvin_parallel_init(struct rvin_dev *vin) to_of_node(vin->parallel.asd->match.fwnode)); vin->notifier.ops = &rvin_parallel_notify_ops; - ret =v4l2_async_notifier_register (&vin->v4l2_dev, &vin->notifier); + ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&vin->notifier); +v4l2_async_nf_cleanup (&vin->notifier);return ret; }
@@ -841,9 +841,8 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id) goto out; } - asd =v4l2_async_notifier_add_fwnode_subdev (&vin->group->notifier, - fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&vin->group->notifier, fwnode, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -882,7 +881,7 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)mutex_unlock (&vin->group->lock); -v4l2_async_notifier_init (&vin->group->notifier); +v4l2_async_nf_init (&vin->group->notifier);/* * Have all VIN's look for CSI-2 subdevices. Some subdevices will
@@ -907,11 +906,10 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)return 0 ; vin->group->notifier.ops = &rvin_group_notify_ops; - ret =v4l2_async_notifier_register (&vin->v4l2_dev, - &vin->group->notifier); + ret =v4l2_async_nf_register (&vin->v4l2_dev, &vin->group->notifier);if (ret <0 ) {vin_err (vin,"Notifier registration failed\n" ); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier);return ret; }
@@ -1455,8 +1453,8 @@ static int rcar_vin_probe(struct platform_device *pdev)if (vin->info->use_mc) {mutex_lock (&vin->group->lock);if (&vin->v4l2_dev == vin->group->notifier.v4l2_dev) { -v4l2_async_notifier_unregister (&vin->group->notifier); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_unregister (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier); }mutex_unlock (&vin->group->lock);rvin_group_put (vin);
@@ -1476,12 +1474,12 @@ static int rcar_vin_remove(struct platform_device *pdev)rvin_v4l2_unregister (vin); -v4l2_async_notifier_unregister (&vin->notifier); -v4l2_async_notifier_cleanup (&vin->notifier); +v4l2_async_nf_unregister (&vin->notifier); +v4l2_async_nf_cleanup (&vin->notifier);if (vin->info->use_mc) { -v4l2_async_notifier_unregister (&vin->group->notifier); -v4l2_async_notifier_cleanup (&vin->group->notifier); +v4l2_async_nf_unregister (&vin->group->notifier); +v4l2_async_nf_cleanup (&vin->group->notifier);rvin_group_put (vin); }
drivers/media/platform/rcar-vin/rcar-csi2.c +9 -10
@@ -917,19 +917,18 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)dev_dbg (priv->dev,"Found '%pOF'\n" ,to_of_node (fwnode)); -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier); priv->notifier.ops = &rcar_csi2_notify_ops; - asd =v4l2_async_notifier_add_fwnode_subdev (&priv->notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&priv->notifier, fwnode, + struct v4l2_async_subdev);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd); - ret =v4l2_async_subdev_notifier_register (&priv->subdev, - &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->subdev, &priv->notifier);if (ret) -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -1285,8 +1284,8 @@ static int rcsi2_probe(struct platform_device *pdev)return 0 ; error: -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);return ret; }
@@ -1295,8 +1294,8 @@ static int rcsi2_remove(struct platform_device *pdev) {struct rcar_csi2 *priv =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (&priv->subdev);pm_runtime_disable (&pdev->dev);
drivers/media/platform/rcar_drif.c +7 -7
@@ -1212,7 +1212,7 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)struct fwnode_handle *fwnode, *ep;struct v4l2_async_subdev *asd; -v4l2_async_notifier_init (notifier); +v4l2_async_nf_init (notifier); ep =fwnode_graph_get_next_endpoint (of_fwnode_handle (sdr->dev->of_node),NULL );
@@ -1229,8 +1229,8 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)return -EINVAL ; } - asd =v4l2_async_notifier_add_fwnode_subdev (notifier, fwnode, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (notifier, fwnode, + struct v4l2_async_subdev);fwnode_handle_put (fwnode);if (IS_ERR (asd))return PTR_ERR (asd);
@@ -1346,7 +1346,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr) sdr->notifier.ops = &rcar_drif_notify_ops;/* Register notifier */ - ret =v4l2_async_notifier_register (&sdr->v4l2_dev, &sdr->notifier); + ret =v4l2_async_nf_register (&sdr->v4l2_dev, &sdr->notifier);if (ret <0 ) {dev_err (sdr->dev,"failed: notifier register ret %d\n" , ret); goto cleanup;
@@ -1355,7 +1355,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)return ret; cleanup: -v4l2_async_notifier_cleanup (&sdr->notifier); +v4l2_async_nf_cleanup (&sdr->notifier); error:v4l2_device_unregister (&sdr->v4l2_dev);
@@ -1365,8 +1365,8 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)/* V4L2 SDR device remove */ static void rcar_drif_sdr_remove (struct rcar_drif_sdr *sdr) { -v4l2_async_notifier_unregister (&sdr->notifier); -v4l2_async_notifier_cleanup (&sdr->notifier); +v4l2_async_nf_unregister (&sdr->notifier); +v4l2_async_nf_cleanup (&sdr->notifier);v4l2_device_unregister (&sdr->v4l2_dev); }
drivers/media/platform/renesas-ceu.c +14 -15
@@ -1513,12 +1513,12 @@ 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 =v4l2_async_notifier_add_i2c_subdev (&ceudev->notifier, - async_sd->i2c_adapter_id, - async_sd->i2c_address, - struct ceu_subdev); + ceu_sd =v4l2_async_nf_add_i2c (&ceudev->notifier, + async_sd->i2c_adapter_id, + async_sd->i2c_address, + struct ceu_subdev);if (IS_ERR (ceu_sd)) { -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);return PTR_ERR (ceu_sd); } ceu_sd->mbus_flags = async_sd->flags;
@@ -1576,9 +1576,9 @@ static int ceu_parse_dt(struct ceu_device *ceudev) }/* Setup the ceu subdevice and the async subdevice. */ - ceu_sd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &ceudev->notifier,of_fwnode_handle (ep), - struct ceu_subdev); + ceu_sd =v4l2_async_nf_add_fwnode_remote (&ceudev->notifier, +of_fwnode_handle (ep), + struct ceu_subdev);if (IS_ERR (ceu_sd)) { ret =PTR_ERR (ceu_sd); goto error_cleanup;
@@ -1592,7 +1592,7 @@ static int ceu_parse_dt(struct ceu_device *ceudev)return num_ep; error_cleanup: -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);of_node_put (ep);return ret; }
@@ -1669,7 +1669,7 @@ static int ceu_probe(struct platform_device *pdev)if (ret) goto error_pm_disable; -v4l2_async_notifier_init (&ceudev->notifier); +v4l2_async_nf_init (&ceudev->notifier);if (IS_ENABLED (CONFIG_OF ) && dev->of_node) { ceu_data =of_device_get_match_data (dev);
@@ -1691,8 +1691,7 @@ static int ceu_probe(struct platform_device *pdev) ceudev->notifier.v4l2_dev = &ceudev->v4l2_dev; ceudev->notifier.ops = &ceu_notify_ops; - ret =v4l2_async_notifier_register (&ceudev->v4l2_dev, - &ceudev->notifier); + ret =v4l2_async_nf_register (&ceudev->v4l2_dev, &ceudev->notifier);if (ret) goto error_cleanup;
@@ -1701,7 +1700,7 @@ static int ceu_probe(struct platform_device *pdev)return 0 ; error_cleanup: -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier); error_v4l2_unregister:v4l2_device_unregister (&ceudev->v4l2_dev); error_pm_disable:
@@ -1718,9 +1717,9 @@ static int ceu_remove(struct platform_device *pdev)pm_runtime_disable (ceudev->dev); -v4l2_async_notifier_unregister (&ceudev->notifier); +v4l2_async_nf_unregister (&ceudev->notifier); -v4l2_async_notifier_cleanup (&ceudev->notifier); +v4l2_async_nf_cleanup (&ceudev->notifier);v4l2_device_unregister (&ceudev->v4l2_dev);
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +9 -8
@@ -246,7 +246,7 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)unsigned int next_id =0 ;int ret; -v4l2_async_notifier_init (ntf); +v4l2_async_nf_init (ntf);while (1 ) {struct v4l2_fwnode_endpoint vep = {
@@ -265,8 +265,9 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)if (ret) goto err_parse; - rk_asd =v4l2_async_notifier_add_fwnode_remote_subdev (ntf, ep, - struct rkisp1_sensor_async); + rk_asd =v4l2_async_nf_add_fwnode_remote (ntf, ep, + struct + rkisp1_sensor_async);if (IS_ERR (rk_asd)) { ret =PTR_ERR (rk_asd); goto err_parse;
@@ -286,16 +287,16 @@ static int rkisp1_subdev_notifier(struct rkisp1_device *rkisp1)continue ; err_parse:fwnode_handle_put (ep); -v4l2_async_notifier_cleanup (ntf); +v4l2_async_nf_cleanup (ntf);return ret; }if (next_id ==0 )dev_dbg (rkisp1->dev,"no remote subdevice found\n" ); ntf->ops = &rkisp1_subdev_notifier_ops; - ret =v4l2_async_notifier_register (&rkisp1->v4l2_dev, ntf); + ret =v4l2_async_nf_register (&rkisp1->v4l2_dev, ntf);if (ret) { -v4l2_async_notifier_cleanup (ntf); +v4l2_async_nf_cleanup (ntf);return ret; }return 0 ;
@@ -542,8 +543,8 @@ static int rkisp1_remove(struct platform_device *pdev) {struct rkisp1_device *rkisp1 =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&rkisp1->notifier); -v4l2_async_notifier_cleanup (&rkisp1->notifier); +v4l2_async_nf_unregister (&rkisp1->notifier); +v4l2_async_nf_cleanup (&rkisp1->notifier);rkisp1_params_unregister (rkisp1);rkisp1_stats_unregister (rkisp1);
drivers/media/platform/stm32/stm32-dcmi.c +9 -9
@@ -1824,11 +1824,11 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)return -EINVAL ; } -v4l2_async_notifier_init (&dcmi->notifier); +v4l2_async_nf_init (&dcmi->notifier); - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &dcmi->notifier,of_fwnode_handle (ep), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&dcmi->notifier, +of_fwnode_handle (ep), + struct v4l2_async_subdev);of_node_put (ep);
@@ -1839,10 +1839,10 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi) dcmi->notifier.ops = &dcmi_graph_notify_ops; - ret =v4l2_async_notifier_register (&dcmi->v4l2_dev, &dcmi->notifier); + ret =v4l2_async_nf_register (&dcmi->v4l2_dev, &dcmi->notifier);if (ret <0 ) {dev_err (dcmi->dev,"Failed to register notifier\n" ); -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier);return ret; }
@@ -2060,7 +2060,7 @@ static int dcmi_probe(struct platform_device *pdev)return 0 ; err_cleanup: -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier); err_media_entity_cleanup:media_entity_cleanup (&dcmi->vdev->entity); err_device_release:
@@ -2080,8 +2080,8 @@ static int dcmi_remove(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); -v4l2_async_notifier_unregister (&dcmi->notifier); -v4l2_async_notifier_cleanup (&dcmi->notifier); +v4l2_async_nf_unregister (&dcmi->notifier); +v4l2_async_nf_cleanup (&dcmi->notifier);media_entity_cleanup (&dcmi->vdev->entity);v4l2_device_unregister (&dcmi->v4l2_dev);media_device_cleanup (&dcmi->mdev);
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +6 -6
@@ -122,7 +122,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -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, - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto out;
@@ -244,7 +244,7 @@ static int sun4i_csi_probe(struct platform_device *pdev)if (ret) goto err_unregister_media; - ret =v4l2_async_notifier_register (&csi->v4l, &csi->notifier); + ret =v4l2_async_nf_register (&csi->v4l, &csi->notifier);if (ret) {dev_err (csi->dev,"Couldn't register our notifier.\n" ); goto err_unregister_media;
@@ -268,8 +268,8 @@ static int sun4i_csi_remove(struct platform_device *pdev) {struct sun4i_csi *csi =platform_get_drvdata (pdev); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);vb2_video_unregister_device (&csi->vdev);media_device_unregister (&csi->mdev);sun4i_csi_dma_unregister (csi);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +10 -9
@@ -717,8 +717,8 @@ static int sun6i_csi_fwnode_parse(struct device *dev,static void sun6i_csi_v4l2_cleanup (struct sun6i_csi *csi) {media_device_unregister (&csi->media_dev); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);sun6i_video_cleanup (&csi->video);v4l2_device_unregister (&csi->v4l2_dev);v4l2_ctrl_handler_free (&csi->ctrl_handler);
@@ -737,7 +737,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) "platform:%s", dev_name(csi->dev));media_device_init (&csi->media_dev); -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,0 );if (ret) {
@@ -759,16 +759,17 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)if (ret) goto unreg_v4l2; - ret =v4l2_async_notifier_parse_fwnode_endpoints (csi->dev, - &csi->notifier, -sizeof (struct v4l2_async_subdev ), - sun6i_csi_fwnode_parse); + ret =v4l2_async_nf_parse_fwnode_endpoints (csi->dev, + &csi->notifier, +sizeof (struct +v4l2_async_subdev ), + sun6i_csi_fwnode_parse);if (ret) goto clean_video; csi->notifier.ops = &sun6i_csi_async_ops; - ret =v4l2_async_notifier_register (&csi->v4l2_dev, &csi->notifier); + ret =v4l2_async_nf_register (&csi->v4l2_dev, &csi->notifier);if (ret) {dev_err (csi->dev,"notifier registration failed\n" ); goto clean_video;
@@ -783,7 +784,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) free_ctrl:v4l2_ctrl_handler_free (&csi->ctrl_handler); clean_media: -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);media_device_cleanup (&csi->media_dev);return ret;
drivers/media/platform/ti-vpe/cal.c +8 -8
@@ -693,7 +693,7 @@ static int cal_async_notifier_register(struct cal_dev *cal)unsigned int i;int ret; -v4l2_async_notifier_init (&cal->notifier); +v4l2_async_nf_init (&cal->notifier); cal->notifier.ops = &cal_async_notifier_ops;for (i =0 ; i < cal->data->num_csi2_phy; ++i) {
@@ -705,9 +705,9 @@ static int cal_async_notifier_register(struct cal_dev *cal)continue ; fwnode =of_fwnode_handle (phy->sensor_node); - casd =v4l2_async_notifier_add_fwnode_subdev (&cal->notifier, - fwnode, - struct cal_v4l2_async_subdev); + casd =v4l2_async_nf_add_fwnode (&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 (casd);
@@ -717,7 +717,7 @@ static int cal_async_notifier_register(struct cal_dev *cal) casd->phy = phy; } - ret =v4l2_async_notifier_register (&cal->v4l2_dev, &cal->notifier); + ret =v4l2_async_nf_register (&cal->v4l2_dev, &cal->notifier);if (ret) {cal_err (cal,"Error registering async notifier\n" ); goto error;
@@ -726,14 +726,14 @@ static int cal_async_notifier_register(struct cal_dev *cal)return 0 ; error: -v4l2_async_notifier_cleanup (&cal->notifier); +v4l2_async_nf_cleanup (&cal->notifier);return ret; }static void cal_async_notifier_unregister (struct cal_dev *cal) { -v4l2_async_notifier_unregister (&cal->notifier); -v4l2_async_notifier_cleanup (&cal->notifier); +v4l2_async_nf_unregister (&cal->notifier); +v4l2_async_nf_cleanup (&cal->notifier); }/* ------------------------------------------------------------------
drivers/media/platform/video-mux.c +8 -9
@@ -360,7 +360,7 @@ static int video_mux_async_register(struct video_mux *vmux,unsigned int i;int ret; -v4l2_async_notifier_init (&vmux->notifier); +v4l2_async_nf_init (&vmux->notifier);for (i =0 ; i < num_input_pads; i++) {struct v4l2_async_subdev *asd;
@@ -372,8 +372,8 @@ static int video_mux_async_register(struct video_mux *vmux,if (!ep)continue ; - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &vmux->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&vmux->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -387,8 +387,7 @@ static int video_mux_async_register(struct video_mux *vmux, vmux->notifier.ops = &video_mux_notify_ops; - ret =v4l2_async_subdev_notifier_register (&vmux->subdev, - &vmux->notifier); + ret =v4l2_async_subdev_nf_register (&vmux->subdev, &vmux->notifier);if (ret)return ret;
@@ -469,8 +468,8 @@ static int video_mux_probe(struct platform_device *pdev) ret =video_mux_async_register (vmux, num_pads -1 );if (ret) { -v4l2_async_notifier_unregister (&vmux->notifier); -v4l2_async_notifier_cleanup (&vmux->notifier); +v4l2_async_nf_unregister (&vmux->notifier); +v4l2_async_nf_cleanup (&vmux->notifier); }return ret;
@@ -481,8 +480,8 @@ static int video_mux_remove(struct platform_device *pdev)struct video_mux *vmux =platform_get_drvdata (pdev);struct v4l2_subdev *sd = &vmux->subdev; -v4l2_async_notifier_unregister (&vmux->notifier); -v4l2_async_notifier_cleanup (&vmux->notifier); +v4l2_async_nf_unregister (&vmux->notifier); +v4l2_async_nf_cleanup (&vmux->notifier);v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);
drivers/media/platform/xilinx/xilinx-vipp.c +8 -9
@@ -382,9 +382,8 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,continue ; } - xge =v4l2_async_notifier_add_fwnode_subdev ( - &xdev->notifier, remote, - struct xvip_graph_entity); + xge =v4l2_async_nf_add_fwnode (&xdev->notifier, remote, + struct xvip_graph_entity);fwnode_handle_put (remote);if (IS_ERR (xge)) { ret =PTR_ERR (xge);
@@ -395,7 +394,7 @@ static int xvip_graph_parse_one(struct xvip_composite_device *xdev,return 0 ; err_notifier_cleanup: -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);fwnode_handle_put (ep);return ret; }
@@ -420,7 +419,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev) entity =to_xvip_entity (asd); ret =xvip_graph_parse_one (xdev, entity->asd.match.fwnode);if (ret <0 ) { -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);break ; } }
@@ -496,8 +495,8 @@ static void xvip_graph_cleanup(struct xvip_composite_device *xdev)struct xvip_dma *dmap;struct xvip_dma *dma; -v4l2_async_notifier_unregister (&xdev->notifier); -v4l2_async_notifier_cleanup (&xdev->notifier); +v4l2_async_nf_unregister (&xdev->notifier); +v4l2_async_nf_cleanup (&xdev->notifier);list_for_each_entry_safe (dma, dmap, &xdev->dmas, list) {xvip_dma_cleanup (dma);
@@ -532,7 +531,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev)/* Register the subdevices notifier. */ xdev->notifier.ops = &xvip_graph_notify_ops; - ret =v4l2_async_notifier_register (&xdev->v4l2_dev, &xdev->notifier); + ret =v4l2_async_nf_register (&xdev->v4l2_dev, &xdev->notifier);if (ret <0 ) {dev_err (xdev->dev,"notifier registration failed\n" ); goto done;
@@ -596,7 +595,7 @@ static int xvip_composite_probe(struct platform_device *pdev) xdev->dev = &pdev->dev;INIT_LIST_HEAD (&xdev->dmas); -v4l2_async_notifier_init (&xdev->notifier); +v4l2_async_nf_init (&xdev->notifier); ret =xvip_composite_v4l2_init (xdev);if (ret <0 )
drivers/media/v4l2-core/v4l2-async.c +82 -86
470 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-fwnode.c +35 -39
154 lines not on this page · raw message
drivers/staging/media/imx/imx-media-csi.c +8 -9
@@ -1924,7 +1924,7 @@ static int imx_csi_async_register(struct csi_priv *priv)unsigned int port;int ret; -v4l2_async_notifier_init (&priv->notifier); +v4l2_async_nf_init (&priv->notifier);/* get this CSI's port id */ ret =fwnode_property_read_u32 (dev_fwnode (priv->dev),"reg" , &port);
@@ -1935,8 +1935,8 @@ static int imx_csi_async_register(struct csi_priv *priv) port,0 , FWNODE_GRAPH_ENDPOINT_NEXT);if (ep) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &priv->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&priv->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -1950,8 +1950,7 @@ static int imx_csi_async_register(struct csi_priv *priv) priv->notifier.ops = &csi_notify_ops; - ret =v4l2_async_subdev_notifier_register (&priv->sd, - &priv->notifier); + ret =v4l2_async_subdev_nf_register (&priv->sd, &priv->notifier);if (ret)return ret;
@@ -2040,8 +2039,8 @@ static int imx_csi_probe(struct platform_device *pdev)return 0 ; cleanup: -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier); free:v4l2_ctrl_handler_free (&priv->ctrl_hdlr);mutex_destroy (&priv->lock);
@@ -2055,8 +2054,8 @@ static int imx_csi_remove(struct platform_device *pdev)v4l2_ctrl_handler_free (&priv->ctrl_hdlr);mutex_destroy (&priv->lock); -v4l2_async_notifier_unregister (&priv->notifier); -v4l2_async_notifier_cleanup (&priv->notifier); +v4l2_async_nf_unregister (&priv->notifier); +v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);
drivers/staging/media/imx/imx-media-dev-common.c +3 -4
@@ -379,7 +379,7 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev,INIT_LIST_HEAD (&imxmd->vdev_list); -v4l2_async_notifier_init (&imxmd->notifier); +v4l2_async_nf_init (&imxmd->notifier);return imxmd;
@@ -403,11 +403,10 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,/* prepare the async subdev notifier and register it */ imxmd->notifier.ops = ops ? ops : &imx_media_notifier_ops; - ret =v4l2_async_notifier_register (&imxmd->v4l2_dev, - &imxmd->notifier); + ret =v4l2_async_nf_register (&imxmd->v4l2_dev, &imxmd->notifier);if (ret) {v4l2_err (&imxmd->v4l2_dev, -"v4l2_async_notifier_register failed with %d\n" , ret); +"v4l2_async_nf_register failed with %d\n" , ret);return ret; }
drivers/staging/media/imx/imx-media-dev.c +3 -3
@@ -94,7 +94,7 @@ static int imx_media_probe(struct platform_device *pdev)return 0 ; cleanup: -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md);
@@ -113,9 +113,9 @@ static int imx_media_remove(struct platform_device *pdev) imxmd->m2m_vdev =NULL ; } -v4l2_async_notifier_unregister (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier);imx_media_unregister_ipu_internal_subdevs (imxmd); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);media_device_unregister (&imxmd->md);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md);
drivers/staging/media/imx/imx-media-of.c +3 -3
@@ -29,9 +29,9 @@ 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), - struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode (&imxmd->notifier, +of_fwnode_handle (csi_np), + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd);if (ret == -EEXIST )
drivers/staging/media/imx/imx6-mipi-csi2.c +8 -9
@@ -647,7 +647,7 @@ static int csi2_async_register(struct csi2_dev *csi2)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi2->notifier); +v4l2_async_nf_init (&csi2->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi2->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -663,8 +663,8 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi2->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi2->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);if (IS_ERR (asd))
@@ -672,8 +672,7 @@ static int csi2_async_register(struct csi2_dev *csi2) csi2->notifier.ops = &csi2_notify_ops; - ret =v4l2_async_subdev_notifier_register (&csi2->sd, - &csi2->notifier); + ret =v4l2_async_subdev_nf_register (&csi2->sd, &csi2->notifier);if (ret)return ret;
@@ -768,8 +767,8 @@ static int csi2_probe(struct platform_device *pdev)return 0 ; clean_notifier: -v4l2_async_notifier_unregister (&csi2->notifier); -v4l2_async_notifier_cleanup (&csi2->notifier); +v4l2_async_nf_unregister (&csi2->notifier); +v4l2_async_nf_cleanup (&csi2->notifier);clk_disable_unprepare (csi2->dphy_clk); pllref_off:clk_disable_unprepare (csi2->pllref_clk);
@@ -783,8 +782,8 @@ static int csi2_remove(struct platform_device *pdev)struct v4l2_subdev *sd =platform_get_drvdata (pdev);struct csi2_dev *csi2 =sd_to_dev (sd); -v4l2_async_notifier_unregister (&csi2->notifier); -v4l2_async_notifier_cleanup (&csi2->notifier); +v4l2_async_nf_unregister (&csi2->notifier); +v4l2_async_nf_cleanup (&csi2->notifier);v4l2_async_unregister_subdev (sd);clk_disable_unprepare (csi2->dphy_clk);clk_disable_unprepare (csi2->pllref_clk);
drivers/staging/media/imx/imx7-media-csi.c +12 -12
@@ -1107,13 +1107,13 @@ static int imx7_csi_async_register(struct imx7_csi *csi)struct fwnode_handle *ep;int ret; -v4l2_async_notifier_init (&csi->notifier); +v4l2_async_nf_init (&csi->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (csi->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );if (ep) { - asd =v4l2_async_notifier_add_fwnode_remote_subdev ( - &csi->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&csi->notifier, ep, + struct v4l2_async_subdev);fwnode_handle_put (ep);
@@ -1127,7 +1127,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi) csi->notifier.ops = &imx7_csi_notify_ops; - ret =v4l2_async_subdev_notifier_register (&csi->sd, &csi->notifier); + ret =v4l2_async_subdev_nf_register (&csi->sd, &csi->notifier);if (ret)return ret;
@@ -1218,12 +1218,12 @@ static int imx7_csi_probe(struct platform_device *pdev)return 0 ; subdev_notifier_cleanup: -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier); cleanup: -v4l2_async_notifier_unregister (&imxmd->notifier); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_unregister (&imxmd->md);media_device_cleanup (&imxmd->md);
@@ -1240,15 +1240,15 @@ static int imx7_csi_remove(struct platform_device *pdev)struct imx7_csi *csi =v4l2_get_subdevdata (sd);struct imx_media_dev *imxmd = csi->imxmd; -v4l2_async_notifier_unregister (&imxmd->notifier); -v4l2_async_notifier_cleanup (&imxmd->notifier); +v4l2_async_nf_unregister (&imxmd->notifier); +v4l2_async_nf_cleanup (&imxmd->notifier);media_device_unregister (&imxmd->md);v4l2_device_unregister (&imxmd->v4l2_dev);media_device_cleanup (&imxmd->md); -v4l2_async_notifier_unregister (&csi->notifier); -v4l2_async_notifier_cleanup (&csi->notifier); +v4l2_async_nf_unregister (&csi->notifier); +v4l2_async_nf_cleanup (&csi->notifier);v4l2_async_unregister_subdev (sd);mutex_destroy (&csi->lock);
drivers/staging/media/imx/imx7-mipi-csis.c +8 -8
@@ -1164,7 +1164,7 @@ static int mipi_csis_async_register(struct csi_state *state)unsigned int i;int ret; -v4l2_async_notifier_init (&state->notifier); +v4l2_async_nf_init (&state->notifier); ep =fwnode_graph_get_endpoint_by_id (dev_fwnode (state->dev),0 ,0 ,FWNODE_GRAPH_ENDPOINT_NEXT );
@@ -1189,8 +1189,8 @@ 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 =v4l2_async_notifier_add_fwnode_remote_subdev ( - &state->notifier, ep, struct v4l2_async_subdev); + asd =v4l2_async_nf_add_fwnode_remote (&state->notifier, ep, + struct v4l2_async_subdev);if (IS_ERR (asd)) { ret =PTR_ERR (asd); goto err_parse;
@@ -1200,7 +1200,7 @@ static int mipi_csis_async_register(struct csi_state *state) state->notifier.ops = &mipi_csis_notify_ops; - ret =v4l2_async_subdev_notifier_register (&state->sd, &state->notifier); + ret =v4l2_async_subdev_nf_register (&state->sd, &state->notifier);if (ret)return ret;
@@ -1431,8 +1431,8 @@ static int mipi_csis_probe(struct platform_device *pdev)mipi_csis_debugfs_exit (state); cleanup:media_entity_cleanup (&state->sd.entity); -v4l2_async_notifier_unregister (&state->notifier); -v4l2_async_notifier_cleanup (&state->notifier); +v4l2_async_nf_unregister (&state->notifier); +v4l2_async_nf_cleanup (&state->notifier);v4l2_async_unregister_subdev (&state->sd); disable_clock:mipi_csis_clk_disable (state);
@@ -1447,8 +1447,8 @@ static int mipi_csis_remove(struct platform_device *pdev)struct csi_state *state =mipi_sd_to_csis_state (sd);mipi_csis_debugfs_exit (state); -v4l2_async_notifier_unregister (&state->notifier); -v4l2_async_notifier_cleanup (&state->notifier); +v4l2_async_nf_unregister (&state->notifier); +v4l2_async_nf_cleanup (&state->notifier);v4l2_async_unregister_subdev (&state->sd);pm_runtime_disable (&pdev->dev);
drivers/staging/media/tegra-video/vi.c +8 -9
@@ -1272,7 +1272,7 @@ static int tegra_channel_init(struct tegra_vi_channel *chan) }if (!IS_ENABLED (CONFIG_VIDEO_TEGRA_TPG )) -v4l2_async_notifier_init (&chan->notifier); +v4l2_async_nf_init (&chan->notifier);return 0 ;
@@ -1811,8 +1811,8 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan,continue ; } - tvge =v4l2_async_notifier_add_fwnode_subdev (&chan->notifier, remote, - struct tegra_vi_graph_entity); + tvge =v4l2_async_nf_add_fwnode (&chan->notifier, remote, + struct tegra_vi_graph_entity);if (IS_ERR (tvge)) { ret =PTR_ERR (tvge); dev_err(vi->dev,
@@ -1834,7 +1834,7 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan, cleanup:dev_err (vi->dev,"failed parsing the graph: %d\n" , ret); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier);of_node_put (node);return ret; }
@@ -1868,13 +1868,12 @@ static int tegra_vi_graph_init(struct tegra_vi *vi)continue ; chan->notifier.ops = &tegra_vi_async_ops; - ret =v4l2_async_notifier_register (&vid->v4l2_dev, - &chan->notifier); + ret =v4l2_async_nf_register (&vid->v4l2_dev, &chan->notifier);if (ret <0 ) {dev_err (vi->dev,"failed to register channel %d notifier: %d\n" , chan->portnos[0 ], ret); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier); } }
@@ -1887,8 +1886,8 @@ static void tegra_vi_graph_cleanup(struct tegra_vi *vi)list_for_each_entry (chan, &vi->vi_chans, list) {vb2_video_unregister_device (&chan->video); -v4l2_async_notifier_unregister (&chan->notifier); -v4l2_async_notifier_cleanup (&chan->notifier); +v4l2_async_nf_unregister (&chan->notifier); +v4l2_async_nf_cleanup (&chan->notifier); } }
include/media/v4l2-async.h +51 -54
198 lines not on this page · raw message
include/media/v4l2-fwnode.h +6 -6
@@ -463,7 +463,7 @@ typedef int (*parse_endpoint_func)(struct device *dev, struct v4l2_async_subdev *asd);/** -* v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a +* v4l2_async_nf_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a * device node * @dev: the device the endpoints of which are to be parsed * @notifier: notifier for @dev
@@ -496,7 +496,7 @@ typedef int (*parse_endpoint_func)(struct device *dev,* to retain that configuration, the user needs to allocate memory for it. * * Any notifier populated using this function must be released with a call to -* v4l2_async_notifier_cleanup() after it has been unregistered and the async +* v4l2_async_nf_cleanup() after it has been unregistered and the async * sub-devices are no longer in use, even if the function returned an error. * * Return: %0 on success, including when no async sub-devices are found
@@ -505,10 +505,10 @@ typedef int (*parse_endpoint_func)(struct device *dev,* Other error codes as returned by @parse_endpoint */ int -v4l2_async_notifier_parse_fwnode_endpoints (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size, -parse_endpoint_func parse_endpoint); +v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, +struct v4l2_async_notifier *notifier, +size_t asd_struct_size, +parse_endpoint_func parse_endpoint);/* Helper macros to access the connector links. */
Signature · 1 line
2.30.2
Sakari Ailus
maintainerPATCH 4/6 media: v4l2-fwnode: Simplify v4l2_async_nf_parse_fwnode_endpoints()
In reply to Sakari AilusFrom: Niklas Söderlund <[email protected]>
There are only one user left of __v4l2_async_nf_parse_fwnode_ep() since [1], v4l2_async_nf_parse_fwnode_endpoints(). The two functions can be merged.
The merge of the two highlights a dead code block conditioned by the argument 'has_port' that always is false and can therefor be removed.
1. commit 0ae426ebd0dcef81 ("media: v4l2-fwnode: Remove v4l2_async_notifier_parse_fwnode_endpoints_by_port()")
--- drivers/media/v4l2-core/v4l2-fwnode.c | 31 +++++---------------------- 1 file changed, 5 insertions(+), 26 deletions(-)
drivers/media/v4l2-core/v4l2-fwnode.c +5 -26
@@ -839,12 +839,11 @@ v4l2_async_nf_fwnode_parse_endpoint(struct device *dev,return ret == -ENOTCONN ?0 : ret; } -static int -__v4l2_async_nf_parse_fwnode_ep (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size,unsigned int port, -bool has_port, -parse_endpoint_func parse_endpoint) +int +v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, +struct v4l2_async_notifier *notifier, +size_t asd_struct_size, +parse_endpoint_func parse_endpoint) {struct fwnode_handle *fwnode;int ret =0 ;
@@ -862,16 +861,6 @@ __v4l2_async_nf_parse_fwnode_ep(struct device *dev,if (!is_available)continue ; -if (has_port) { -struct fwnode_endpoint ep; - - ret =fwnode_graph_parse_endpoint (fwnode, &ep); -if (ret) -break ; - -if (ep.port != port) -continue ; - } ret = v4l2_async_nf_fwnode_parse_endpoint(dev, notifier, fwnode,
@@ -885,16 +874,6 @@ __v4l2_async_nf_parse_fwnode_ep(struct device *dev,return ret; } - -int -v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size, -parse_endpoint_func parse_endpoint) -{ -return __v4l2_async_nf_parse_fwnode_ep (dev, notifier, asd_struct_size, -0 , false, parse_endpoint); -}EXPORT_SYMBOL_GPL (v4l2_async_nf_parse_fwnode_endpoints);/*
Signature · 1 line
2.30.2
Re: [PATCH 4/6] media: v4l2-fwnode: Simplify v4l2_async_nf_parse_fwnode_endpoints()
Hi Sakari,
Quoted 6 lines · Sakari Ailus
From: Niklas Söderlund <[email protected]>
There are only one user left of
__v4l2_async_nf_parse_fwnode_ep()since [1],v4l2_async_nf_parse_fwnode_endpoints(). The two functions can be merged.
Quoted 8 lines
The merge of the two highlights a dead code block conditioned by the argument '
has_port' that always is false and can therefor be removed.1. commit
0ae426ebd0dcef81("media: v4l2-fwnode: Removev4l2_async_notifier_parse_fwnode_endpoints_by_port()")Signed-off-by Niklas Söderlund <[email protected]>[Sakari Ailus: Aligned some lines to opening parentheses.]Signed-off-by Sakari Ailus <[email protected]>
I guess my tag went lost
Thanks
j
Quoted 63 lines
--- drivers/media/v4l2-core/v4l2-fwnode.c | 31 +++++---------------------- 1 file changed, 5 insertions(+), 26 deletions(-)drivers/media/v4l2-core/v4l2-fwnode.c +5
-27@@ -839,12 +839,11 @@ v4l2_async_nf_fwnode_parse_endpoint(struct device *dev,return ret == -ENOTCONN ?0 : ret; } -static int -__v4l2_async_nf_parse_fwnode_ep (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size,unsigned int port, -bool has_port, -parse_endpoint_func parse_endpoint) +int +v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, +struct v4l2_async_notifier *notifier, +size_t asd_struct_size, +parse_endpoint_func parse_endpoint) {struct fwnode_handle *fwnode;int ret =0 ;@@ -862,16 +861,6 @@ __v4l2_async_nf_parse_fwnode_ep(struct device *dev,if (!is_available)continue ; -if (has_port) { -struct fwnode_endpoint ep; - - ret =fwnode_graph_parse_endpoint (fwnode, &ep); -if (ret) -break ; - -if (ep.port != port) -continue ; - } ret = v4l2_async_nf_fwnode_parse_endpoint(dev, notifier, fwnode,@@ -885,16 +874,6 @@ __v4l2_async_nf_parse_fwnode_ep(struct device *dev,return ret; } - -int -v4l2_async_nf_parse_fwnode_endpoints (struct device *dev, -struct v4l2_async_notifier *notifier, -size_t asd_struct_size, -parse_endpoint_func parse_endpoint) -{ -return __v4l2_async_nf_parse_fwnode_ep (dev, notifier, asd_struct_size, -0 , false, parse_endpoint); -}EXPORT_SYMBOL_GPL (v4l2_async_nf_parse_fwnode_endpoints);/* -- 2.30.2
Sakari Ailus
maintainerPATCH 5/6 media: rcar-vin: Remove explicit device availability check
In reply to Sakari AilusFrom: Niklas Söderlund <[email protected]>
The fwnode is retrieved using fwnode_graph_get_endpoint_by_id() without the FWNODE_GRAPH_DEVICE_DISABLED flag set. So there is no need to explicitly check if the fwnode is available as it always will be when the check is performed, remove it.
--- drivers/media/platform/rcar-vin/rcar-core.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/media/platform/rcar-vin/rcar-core.c +0 -7
@@ -834,13 +834,6 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id) goto out; } -if (!of_device_is_available (to_of_node (fwnode))) { -vin_dbg (vin,"OF device %pOF disabled, ignoring\n" , -to_of_node (fwnode)); - ret = -ENOTCONN ; - goto out; - } - asd =v4l2_async_nf_add_fwnode (&vin->group->notifier, fwnode, struct v4l2_async_subdev);if (IS_ERR (asd)) {
Signature · 1 line
2.30.2
Re: [PATCH 5/6] media: rcar-vin: Remove explicit device availability check
Hi Sakari,
Quoted 9 lines · Sakari Ailus
From: Niklas Söderlund <[email protected]>
The fwnode is retrieved using
fwnode_graph_get_endpoint_by_id()without theFWNODE_GRAPH_DEVICE_DISABLEDflag set. So there is no need to explicitly check if the fwnode is available as it always will be when the check is performed, remove it.Signed-off-by Niklas Söderlund <[email protected]>Signed-off-by Sakari Ailus <[email protected]>
Thanks
j
Quoted 25 lines
--- drivers/media/platform/rcar-vin/rcar-core.c | 7 ------- 1 file changed, 7 deletions(-)drivers/media/platform/rcar-vin/rcar-core.c +0
-8@@ -834,13 +834,6 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id) goto out; } -if (!of_device_is_available (to_of_node (fwnode))) { -vin_dbg (vin,"OF device %pOF disabled, ignoring\n" , -to_of_node (fwnode)); - ret = -ENOTCONN ; - goto out; - } - asd =v4l2_async_nf_add_fwnode (&vin->group->notifier, fwnode, struct v4l2_async_subdev);if (IS_ERR (asd)) { --2.30.2
Sakari Ailus
maintainerPATCH 6/6 Documentation: v4l: Fix V4L2_CID_PIXEL_RATE documentation
In reply to Sakari AilusThe V4L2_CID_PIXEL_RATE is nowadays used to tell pixel sampling rate in the sub-device's pixel array, not the pixel rate over a link (for which it also becomes unfit with the addition of multiplexed streams later on). Fix this.
--- .../userspace-api/media/v4l/ext-ctrls-image-process.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst +1 -1
@@ -38,7 +38,7 @@ Image Process Control IDs of this control is Hz. ``V4L2_CID_PIXEL_RATE (64-bit integer)`` - Pixel rate in the source pads of the subdev. This control is + Pixel sampling rate in the device's pixel array. This control is read-only and its unit is pixels / second. ``V4L2_CID_TEST_PATTERN (menu)``
Signature · 1 line
2.30.2
Re: [PATCH 6/6] Documentation: v4l: Fix V4L2_CID_PIXEL_RATE documentation
Hi Sakari,
Quoted 6 lines · Sakari Ailus
The
V4L2_CID_PIXEL_RATEis nowadays used to tell pixel sampling rate in the sub-device's pixel array, not the pixel rate over a link (for which it also becomes unfit with the addition of multiplexed streams later on). Fix this.Signed-off-by Sakari Ailus <[email protected]>
Thanks
j
Quoted 20 lines
--- .../userspace-api/media/v4l/ext-ctrls-image-process.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst +1
-2@@ -38,7 +38,7 @@ Image Process Control IDs of this control is Hz. ``V4L2_CID_PIXEL_RATE (64-bit integer)`` - Pixel rate in the source pads of the subdev. This control is + Pixel sampling rate in the device's pixel array. This control is read-only and its unit is pixels / second. ``V4L2_CID_TEST_PATTERN (menu)`` --2.30.2
Re: [PATCH 6/6] Documentation: v4l: Fix V4L2_CID_PIXEL_RATE documentation
In reply to Sakari AilusHi Sakari,
Thank you for your patch!
Quoted 6 lines · Sakari Ailus
The
V4L2_CID_PIXEL_RATEis nowadays used to tell pixel sampling rate in the sub-device's pixel array, not the pixel rate over a link (for which it also becomes unfit with the addition of multiplexed streams later on). Fix this.Signed-off-by Sakari Ailus <[email protected]>
Thanks,
Andrey
Quoted 18 lines
--- .../userspace-api/media/v4l/ext-ctrls-image-process.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst +1
-1@@ -38,7 +38,7 @@ Image Process Control IDs of this control is Hz. ``V4L2_CID_PIXEL_RATE (64-bit integer)`` - Pixel rate in the source pads of the subdev. This control is + Pixel sampling rate in the device's pixel array. This control is read-only and its unit is pixels / second. ``V4L2_CID_TEST_PATTERN (menu)``