diff options
| author |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-23 07:55:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-23 07:55:59 -0300 |
| commit | 7e5b7d1b3a8facd4dc1ddb5d9ec53c0687d13de7 (patch) | |
| tree | 68bf4cf7fc44e0f8bf6e46116996fe7b969fda4e /scripts | |
| parent | [media] doc-rst: cec: update documentation (diff) | |
| parent | doc-rst: kernel-doc: fix handling of address_space tags (diff) | |
| download | linux-dev-7e5b7d1b3a8facd4dc1ddb5d9ec53c0687d13de7.tar.xz linux-dev-7e5b7d1b3a8facd4dc1ddb5d9ec53c0687d13de7.zip | |
Merge branch 'docs-next' of git://git.lwn.net/linux into topic/docs-next
* 'docs-next' of git://git.lwn.net/linux:
doc-rst: kernel-doc: fix handling of address_space tags
Revert "doc/sphinx: Enable keep_warnings"
doc-rst: kernel-doc directive, fix state machine reporter
docs: deprecate kernel-doc-nano-HOWTO.txt
doc/sphinx: Enable keep_warnings
Documentation: add watermark_scale_factor to the list of vm systcl file
kernel-doc: Fix up warning output
docs: Get rid of some kernel-documentation warnings
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kernel-doc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 41eade332307..f9652c25e09a 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1848,6 +1848,10 @@ sub output_function_rst(%) { } $count++; $type = $args{'parametertypes'}{$parameter}; + + # RST doesn't like address_space tags at function prototypes + $type =~ s/__(user|kernel|iomem|percpu|pmem|rcu)\s*//; + if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { # pointer-to-function print $1 . $parameter . ") (" . $2; @@ -2994,7 +2998,7 @@ sub process_file($) { } } elsif ($inline_doc_state == STATE_INLINE_NAME) { $inline_doc_state = STATE_INLINE_ERROR; - print STDERR "Warning(${file}:$.): "; + print STDERR "${file}:$.: warning: "; print STDERR "Incorrect use of kernel-doc format: $_"; ++$warnings; } |