kernel-doc: fix function-pointer-parameter parsing

When running "make htmldocs" I'm seeing some non-fatal perl errors caused
by trying to parse the callback function definitions in blk-core.c.

The errors are "Use of uninitialized value in concatenation (.)..."
in combination with:
Warning(linux-2.6.25-rc2/block/blk-core.c:1877): No description found for parameter ''

The function pointers are defined without a * i.e.
int (drv_callback)(struct request *)

The compiler is happy with them, but kernel-doc isn't.

This patch teaches create_parameterlist in kernel-doc to parse this type of
function pointer definition, but is it the right way to fix the problem ?
The problem only seems to occur in blk-core.c.

However with the patch applied, kernel-doc finds the correct parameter
description for the callback in blk_end_request_callback, which is doesn't
normally.

I thought it would be a bit odd to change to code to use the more normal
form of function pointers just to get the documentation to work, so I fixed
kernel-doc instead - even though this is teaching it to understand code
that might go away (The comment for blk_end_request_callback says that it
should not be used and will removed at some point).

Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 26146cbaa50..74c2f9db2aa 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1512,13 +1512,13 @@ sub create_parameterlist($$$) {
             # corresponding data structures "correctly". Catch it later in
             # output_* subs.
             push_parameter($arg, "", $file);
-        } elsif ($arg =~ m/\(.*\*/) {
+        } elsif ($arg =~ m/\(.+\)\s*\(/) {
             # pointer-to-function
             $arg =~ tr/#/,/;
-            $arg =~ m/[^\(]+\(\*\s*([^\)]+)\)/;
+            $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/;
             $param = $1;
             $type = $arg;
-            $type =~ s/([^\(]+\(\*)$param/$1/;
+            $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
             push_parameter($param, $type, $file);
         } elsif ($arg) {
             $arg =~ s/\s*:\s*/:/g;