From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 2 Jan 2017 15:22:23 +0000 (+0100)
Subject: kernel-doc: cleanup parameter type in function-typed arguments
X-Git-Tag: pci-v4.11-fixes-1~32^2~35
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02a4f4fe522c29bcd4a61e094f7fe8d64f00ee06;p=users%2Fdwmw2%2Flinux.git

kernel-doc: cleanup parameter type in function-typed arguments

A prototype like

    /**
     * foo - sample definition
     * @bar: a parameter
     */
    int foo(int (*bar)(int x,
                       int y));

is currently producing

    .. c:function:: int foo (int (*bar) (int x,                    int y)

       sample definition

    **Parameters**

    ``int (*)(int x,                    int y) bar``
      a parameter

Collapse the spaces so that the output is nicer.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 030fc633acd4a..c1ea91c2e497c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2409,6 +2409,7 @@ sub push_parameter($$$) {
 	# "[blah" in a parameter string;
 	###$param =~ s/\s*//g;
 	push @parameterlist, $param;
+	$type =~ s/\s\s+/ /g;
 	$parametertypes{$param} = $type;
 }