From cf022874b687f73fa5356edf99f9869523fbb300 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 18 Jul 2016 14:46:07 -0300 Subject: [PATCH] [media] doc-rst: fix media kAPI documentation I ended by adding twice each media header, because I saw some missing stuff at the documents. It seems it was my mistake, as everything seems to be there. So, remove those extra stuff, to avoid duplicating the documentation of the functions. Signed-off-by: Mauro Carvalho Chehab --- Documentation/media/kapi/dtv-core.rst | 4 ---- Documentation/media/kapi/mc-core.rst | 8 -------- Documentation/media/kapi/rc-core.rst | 3 +-- Documentation/media/kapi/v4l2-core.rst | 21 --------------------- 4 files changed, 1 insertion(+), 35 deletions(-) diff --git a/Documentation/media/kapi/dtv-core.rst b/Documentation/media/kapi/dtv-core.rst index 3291190c1865..11da77e141ed 100644 --- a/Documentation/media/kapi/dtv-core.rst +++ b/Documentation/media/kapi/dtv-core.rst @@ -130,7 +130,3 @@ Digital TV Conditional Access kABI ---------------------------------- .. kernel-doc:: drivers/media/dvb-core/dvb_ca_en50221.h - - -.. kernel-doc:: drivers/media/dvb-core/dvb_ca_en50221.h - :export: drivers/media/dvb-core/dvb_ca_en50221.c diff --git a/Documentation/media/kapi/mc-core.rst b/Documentation/media/kapi/mc-core.rst index 2ab541ba6e88..c1fe0d69207d 100644 --- a/Documentation/media/kapi/mc-core.rst +++ b/Documentation/media/kapi/mc-core.rst @@ -261,11 +261,3 @@ in the end provide a way to use driver-specific callbacks. .. kernel-doc:: include/media/media-devnode.h .. kernel-doc:: include/media/media-entity.h - - - -.. kernel-doc:: include/media/media-device.h - :export: drivers/media/media-device.c - -.. kernel-doc:: include/media/media-entity.h - :export: drivers/media/media-entity.c diff --git a/Documentation/media/kapi/rc-core.rst b/Documentation/media/kapi/rc-core.rst index 9c244ac9ce92..a45895886257 100644 --- a/Documentation/media/kapi/rc-core.rst +++ b/Documentation/media/kapi/rc-core.rst @@ -6,8 +6,7 @@ Remote Controller core .. kernel-doc:: include/media/rc-core.h -.. kernel-doc:: include/media/rc-core.h include/media/rc-map.h - :export: drivers/media/rc/rc-main.c drivers/media/rc/rc-raw.c +.. kernel-doc:: include/media/rc-map.h LIRC ~~~~ diff --git a/Documentation/media/kapi/v4l2-core.rst b/Documentation/media/kapi/v4l2-core.rst index 4e2aa721d9c8..a1b73e8d6795 100644 --- a/Documentation/media/kapi/v4l2-core.rst +++ b/Documentation/media/kapi/v4l2-core.rst @@ -34,24 +34,3 @@ Video2Linux devices .. kernel-doc:: include/media/videobuf2-v4l2.h .. kernel-doc:: include/media/videobuf2-memops.h - - - - -.. kernel-doc:: include/media/tveeprom.h - :export: drivers/media/common/tveeprom.c - -.. kernel-doc:: include/media/v4l2-ctrls.h - :export: drivers/media/v4l2-core/v4l2-ctrls.c - -.. kernel-doc:: include/media/v4l2-dv-timings.h - :export: drivers/media/v4l2-core/v4l2-dv-timings.c - -.. kernel-doc:: include/media/v4l2-flash-led-class.h - :export: drivers/media/v4l2-core/v4l2-flash-led-class.c - -.. kernel-doc:: include/media/v4l2-mc.h - :export: drivers/media/v4l2-core/v4l2-mc.c - -.. kernel-doc:: include/media/videobuf2-core.h - :export: drivers/media/v4l2-core/videobuf2-core.c -- 2.39.5