From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Tue, 15 Apr 2025 03:12:48 +0000 (+0800)
Subject: scripts/lib/kdoc/kdoc_files.py: don't try to join None
X-Git-Tag: v6.16-rc1~176^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=439111ee0cefe434788802237673c9a37f6b6d04;p=thirdparty%2Fkernel%2Fstable.git

scripts/lib/kdoc/kdoc_files.py: don't try to join None

If out_msg() returns None, it means that an unknown declaration
was found. Avoid letting the script crash on such case.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/4334d16f14cfd93e611b290fb56c35d236cadcb7.1744685912.git.mchehab+huawei@kernel.org
---

diff --git a/scripts/lib/kdoc/kdoc_files.py b/scripts/lib/kdoc/kdoc_files.py
index dd003feefd1bf..2e51e5f3bb77f 100644
--- a/scripts/lib/kdoc/kdoc_files.py
+++ b/scripts/lib/kdoc/kdoc_files.py
@@ -270,13 +270,16 @@ class KernelFiles():
 
             msg = ""
             for name, arg in self.results[fname]:
-                msg += self.out_msg(fname, name, arg)
+                m = self.out_msg(fname, name, arg)
 
-                if msg is None:
+                if m is None:
                     ln = arg.get("ln", 0)
                     dtype = arg.get('type', "")
 
                     self.config.log.warning("%s:%d Can't handle %s",
                                             fname, ln, dtype)
+                else:
+                    msg += m
+
             if msg:
                 yield fname, msg