summaryrefslogtreecommitdiff
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorDanilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>2015-09-01 20:44:14 +0300
committerJonathan Corbet <corbet@lwn.net>2015-09-13 23:38:50 +0300
commit23aebb3c05f3b3fb06a68bf6b1539a05a5f8aaab (patch)
treea574832b3b4d9954dba1fae6cefe2f76eb3308bc /scripts/kernel-doc
parent47f16529a7b0d359ee5ac29dc88c99d1ce0323b9 (diff)
downloadlinux-23aebb3c05f3b3fb06a68bf6b1539a05a5f8aaab.tar.xz
scripts/kernel-doc: Processing -nofunc for functions only
Docproc processes the EXPORT_SYMBOL(f1) macro and uses -nofunc f1 to avoid duplicated documentation in the next call. It works for most of the cases, but there are some specific situations where a struct has the same name of an already-exported function. Current kernel-doc behavior ignores those structs and does not add them to the final documentation. This patch fixes it. This is unusual, the only case I've found is the drm_modeset_lock (function and struct) defined in drm_modeset_lock.h and drm_modeset_lock.c. Considering this, it should only affect the DRM documentation by including struct drm_modeset_lock to the final Docbook. Signed-off-by: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9a08fb5c1af6..532d8cd2543f 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1746,7 +1746,7 @@ sub output_declaration {
my $func = "output_${functype}_$output_mode";
if (($function_only==0) ||
( $function_only == 1 && defined($function_table{$name})) ||
- ( $function_only == 2 && !defined($function_table{$name})))
+ ( $function_only == 2 && !($functype eq "function" && defined($function_table{$name}))))
{
&$func(@_);
$section_counter++;