[PATCH v3 13/17] scripts: kernel-doc: get rid of $nested parameter

[Mauro Carvalho Chehab]

The check_sections() function has a $nested parameter, meant
to identify when a nested struct is present. As we now have
a logic that handles it, get rid of such parameter.

Suggested-by: Markus Heiser <markus.hei...@darmarit.de>
Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
---
 scripts/kernel-doc | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 1b4a096a409b..8fe62b2dbc2d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -983,7 +983,6 @@ sub dump_union($$) {
 sub dump_struct($$) {
     my $x = shift;
     my $file = shift;
-    my $nested;
 
     if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
        my $decl_type = $1;
@@ -1041,11 +1040,9 @@ sub dump_struct($$) {
 
        # Ignore other nested elements, like enums
        $members =~ s/({[^\{\}]*})//g;
-       $nested = $decl_type;
-       $nested =~ s/\/\*.*?\*\///gos;
 
        create_parameterlist($members, ';', $file);
-       check_sections($file, $declaration_name, $decl_type, $sectcheck, 
$struct_actual, $nested);
+       check_sections($file, $declaration_name, $decl_type, $sectcheck, 
$struct_actual);
 
        # Adjust declaration for better display
        $declaration =~ s/([{;])/$1\n/g;
@@ -1350,8 +1347,8 @@ sub push_parameter($$$) {
        $parametertypes{$param} = $type;
 }
 
-sub check_sections($$$$$$) {
-       my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck, $nested) = 
@_;
+sub check_sections($$$$$) {
+       my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck) = @_;
        my @sects = split ' ', $sectcheck;
        my @prms = split ' ', $prmscheck;
        my $err;
@@ -1385,14 +1382,6 @@ sub check_sections($$$$$$) {
                                        "'$sects[$sx]' " .
                                        "description in '$decl_name'\n";
                                ++$warnings;
-                       } else {
-                               if ($nested !~ m/\Q$sects[$sx]\E/) {
-                                   print STDERR "${file}:$.: warning: " .
-                                       "Excess $decl_type member " .
-                                       "'$sects[$sx]' " .
-                                       "description in '$decl_name'\n";
-                                   ++$warnings;
-                               }
                        }
                }
        }
@@ -1503,7 +1492,7 @@ sub dump_function($$) {
     }
 
        my $prms = join " ", @parameterlist;
-       check_sections($file, $declaration_name, "function", $sectcheck, $prms, 
"");
+       check_sections($file, $declaration_name, "function", $sectcheck, $prms);
 
         # This check emits a lot of warnings at the moment, because many
         # functions don't have a 'Return' doc section. So until the number
-- 
2.13.6