diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-03 04:08:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 19:46:02 -0300 |
| commit | 3eef25107cab65a1158b11ba373fb9b4fc25b4b8 (patch) | |
| tree | ab964c2868826e14c4a8ccf83f4e6703d4b97402 /Documentation | |
| parent | cd634f1bfc182e564f33809fdca33027bb99fceb (diff) | |
| download | linux-3eef25107cab65a1158b11ba373fb9b4fc25b4b8.tar.bz2 | |
[media] v4l2: drop V4L2_CHIP_MATCH_SUBDEV_NAME
After using the new VIDIOC_DBG_G_CHIP_NAME ioctl I realized that the matching
by name possibility is useless. Just drop it and rename MATCH_SUBDEV_IDX to
just MATCH_SUBDEV.
The v4l2-dbg utility is much better placed to match by name by just enumerating
all bridge and subdev devices until chip_name.name matches.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation')
3 files changed, 5 insertions, 37 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml index 82e43c6c72b8..921e18550d26 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml @@ -221,13 +221,8 @@ the values from <xref linkend="chip-ids" />.</entry> <entry>Match the nth anciliary AC97 chip.</entry> </row> <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_NAME</constant></entry> + <entry><constant>V4L2_CHIP_MATCH_SUBDEV</constant></entry> <entry>4</entry> - <entry>Match the sub-device by name. Can't be used with this ioctl.</entry> - </row> - <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_IDX</constant></entry> - <entry>5</entry> <entry>Match the nth sub-device. Can't be used with this ioctl.</entry> </row> </tbody> diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-name.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-name.xml index 5fce8d84288e..fa3bd42ab167 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-name.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-name.xml @@ -87,16 +87,7 @@ connected to the PCI or USB bus. Non-zero numbers identify specific parts of the bridge chip such as an AC97 register block.</para> <para>When <structfield>match.type</structfield> is -<constant>V4L2_CHIP_MATCH_SUBDEV_NAME</constant>, -<structfield>match.name</structfield> contains the name of a sub-device. -For instance -<constant>"saa7127 6-0044"</constant> will match the saa7127 sub-device -at the given i2c bus. This match type is not very useful for this ioctl -and is here only for consistency. -</para> - - <para>When <structfield>match.type</structfield> is -<constant>V4L2_CHIP_MATCH_SUBDEV_IDX</constant>, +<constant>V4L2_CHIP_MATCH_SUBDEV</constant>, <structfield>match.addr</structfield> selects the nth sub-device. This allows you to enumerate over all sub-devices.</para> @@ -207,13 +198,8 @@ is set, then the driver supports reading registers from the device. If <entry>Match the nth anciliary AC97 chip. Can't be used with this ioctl.</entry> </row> <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_NAME</constant></entry> + <entry><constant>V4L2_CHIP_MATCH_SUBDEV</constant></entry> <entry>4</entry> - <entry>Match the sub-device by name.</entry> - </row> - <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_IDX</constant></entry> - <entry>5</entry> <entry>Match the nth sub-device.</entry> </row> </tbody> diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml index 3082b4149dbe..db7844f2439f 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml @@ -123,15 +123,7 @@ bus address.</para> on the TV card.</para> <para>When <structfield>match.type</structfield> is -<constant>V4L2_CHIP_MATCH_SUBDEV_NAME</constant>, -<structfield>match.name</structfield> contains the sub-device name. -For instance -<constant>"saa7127 6-0044"</constant> will match this specific saa7127 -sub-device. Again with the &VIDIOC-DBG-G-CHIP-NAME; ioctl you can find -out which sub-devices are present.</para> - - <para>When <structfield>match.type</structfield> is -<constant>V4L2_CHIP_MATCH_SUBDEV_IDX</constant>, +<constant>V4L2_CHIP_MATCH_SUBDEV</constant>, <structfield>match.addr</structfield> selects the nth sub-device.</para> <note> @@ -250,13 +242,8 @@ register.</entry> <entry>Match the nth anciliary AC97 chip.</entry> </row> <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_NAME</constant></entry> + <entry><constant>V4L2_CHIP_MATCH_SUBDEV</constant></entry> <entry>4</entry> - <entry>Match the sub-device by name.</entry> - </row> - <row> - <entry><constant>V4L2_CHIP_MATCH_SUBDEV_IDX</constant></entry> - <entry>5</entry> <entry>Match the nth sub-device.</entry> </row> </tbody> |