[PATCH 26/28] wifi: wil6210: Refactor resume_triggers2string() to use seq_buf
From: Bill Wendling <morbo@google.com>
Date: 2026-09-15 08:20:22
Also in:
dri-devel, intel-wired-lan, intel-xe, linux-devicetree, linux-edac, linux-hardening, linux-input, linux-media, linux-mips, linux-nfs, linux-samsung-soc, linux-scsi, linux-sound, linux-wireless, lkml, loongarch, netdev
Subsystem:
atheros ath generic utilities, the rest, wilocity wil6210 wireless driver · Maintainers:
Jeff Johnson, Linus Torvalds
resume_triggers2string() builds a space-separated string of active resume trigger names using a series of conditional strlcat() calls. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() calls with struct seq_buf and seq_buf_puts(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:1.0 [editor_update_file, make_kernel_build_single_file] Signed-off-by: Bill Wendling <morbo@google.com> --- Cc: Russell King <linux@armlinux.org.uk> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: WANG Xuerui <kernel@xen0n.name> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@gmail.com> Cc: Simona Vetter <simona@ffwll.ch> Cc: Matthew Brost <matthew.brost@intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Matthias Schwarzott <zzam@gentoo.org> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> Cc: Andrew Lunn <andrew+netdev@lunn.ch> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Arend van Spriel <arend.vanspriel@broadcom.com> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Peter Griffin <peter.griffin@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Linus Walleij <linusw@kernel.org> Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com> Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> Cc: "Martin K. Petersen" <mkp@kernel.org> Cc: Trond Myklebust <trondmy@kernel.org> Cc: Anna Schumaker <anna@kernel.org> Cc: Mike Marshall <hubcap@omnibond.com> Cc: Martin Brandenburg <martin@omnibond.com> Cc: Kees Cook <kees@kernel.org> Cc: Jiri Pirko <jiri@resnulli.us> Cc: Simon Horman <horms@kernel.org> Cc: Chuck Lever <cel@kernel.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: NeilBrown <neil@brown.name> Cc: Olga Kornievskaia <okorniev@redhat.com> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Tom Talpey <tom@talpey.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Bill Wendling <morbo@google.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: "Mike Rapoport (Microsoft)" <rppt@kernel.org> Cc: Kanglong Wang <redacted> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Qiang Ma <redacted> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Pengpeng Hou <redacted> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Breno Leitao <leitao@debian.org> Cc: Thorsten Blum <blum@kernel.org> Cc: Harshit Mogalapalli <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Lyude Paul <lyude@redhat.com> Cc: Ashutosh Desai <redacted> Cc: Imre Deak <redacted> Cc: Dmitry Baryshkov <redacted> Cc: Johan Hovold <johan@kernel.org> Cc: Johannes Berg <redacted> Cc: Miri Korenblit <miriam.rachel.korenblit@intel.com> Cc: Alexander Stein <redacted> Cc: Cryolitia PukNgae <cryolitia@uniontech.com> Cc: Jiaming Zhang <redacted> Cc: Will Porter <redacted> Cc: Cen Zhang <redacted> Cc: "Cássio Gabriel" <redacted> Cc: Rong Zhang <redacted> Cc: Arun Raghavan <redacted> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@vger.kernel.org --- drivers/net/wireless/ath/wil6210/wmi.c | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 479b2418ca34..fcc9e9eb5732 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c@@ -7,6 +7,7 @@ #include <linux/moduleparam.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/seq_buf.h> #include "wil6210.h" #include "txrx.h"
@@ -3162,27 +3163,30 @@ int wmi_suspend(struct wil6210_priv *wil) static void resume_triggers2string(u32 triggers, char *string, int str_size) { - string[0] = '\0'; + struct seq_buf s; + + seq_buf_init(&s, string, str_size); if (!triggers) { - strlcat(string, " UNKNOWN", str_size); - return; + seq_buf_puts(&s, " UNKNOWN"); + } else { + if (triggers & WMI_RESUME_TRIGGER_HOST) + seq_buf_puts(&s, " HOST"); + + if (triggers & WMI_RESUME_TRIGGER_UCAST_RX) + seq_buf_puts(&s, " UCAST_RX"); + + if (triggers & WMI_RESUME_TRIGGER_BCAST_RX) + seq_buf_puts(&s, " BCAST_RX"); + + if (triggers & WMI_RESUME_TRIGGER_WMI_EVT) + seq_buf_puts(&s, " WMI_EVT"); + + if (triggers & WMI_RESUME_TRIGGER_DISCONNECT) + seq_buf_puts(&s, " DISCONNECT"); } - if (triggers & WMI_RESUME_TRIGGER_HOST) - strlcat(string, " HOST", str_size); - - if (triggers & WMI_RESUME_TRIGGER_UCAST_RX) - strlcat(string, " UCAST_RX", str_size); - - if (triggers & WMI_RESUME_TRIGGER_BCAST_RX) - strlcat(string, " BCAST_RX", str_size); - - if (triggers & WMI_RESUME_TRIGGER_WMI_EVT) - strlcat(string, " WMI_EVT", str_size); - - if (triggers & WMI_RESUME_TRIGGER_DISCONNECT) - strlcat(string, " DISCONNECT", str_size); + seq_buf_str(&s); } int wmi_resume(struct wil6210_priv *wil)
--
2.55.0.1032.g73a4cd73de-goog