diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-02-16 14:48:18 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-02-19 00:55:03 +0100 |
| commit | fe7bc493d9795c0ad6012fca0f8144d45af48f8d (patch) | |
| tree | b5f6d037e06f70ef4d0c9790b8549f83f418d558 /scripts/kernel-doc | |
| parent | doc-guide: kernel-doc: move in-line section to be after nested struct (diff) | |
| download | linux-fe7bc493d9795c0ad6012fca0f8144d45af48f8d.tar.xz linux-fe7bc493d9795c0ad6012fca0f8144d45af48f8d.zip | |
scripts: kernel-doc: support in-line comments on nested structs/unions
The parser at kernel-doc rejects names with dots in the middle.
Fix it, in order to support nested structs/unions.
Tested-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index a6a9a8ef116c..dc68d76f21ab 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -363,7 +363,7 @@ my $doc_sect = $doc_com . my $doc_content = $doc_com_body . '(.*)'; my $doc_block = $doc_com . 'DOC:\s*(.*)?'; my $doc_inline_start = '^\s*/\*\*\s*$'; -my $doc_inline_sect = '\s*\*\s*(@[\w\s]+):(.*)'; +my $doc_inline_sect = '\s*\*\s*(@\s*[\w][\w\.]*\s*):(.*)'; my $doc_inline_end = '^\s*\*/\s*$'; my $doc_inline_oneline = '^\s*/\*\*\s*(@[\w\s]+):\s*(.*)\s*\*/\s*$'; my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*\(\s*(\w+)\s*\)\s*;'; |