From nobody Sat Jul 25 03:06:28 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8AD23CC315 for ; Mon, 20 Jul 2026 08:43:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537012; cv=none; b=MPw2kIxr4hsBzbVLQMvwa9wsGJjWUvcDGqH9/kiI8ADZq8nAxFKmgznRFbyUWIxYA9nAni6Kf6m20P+GQsZiqAd/JdERA9guoi4MKK0gMqZy15piUfXtqGwK1JVsCQW4LZK2yzM1QnF068YdjRUB/NeC95/7OvGRLC9uLhRu0zU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537012; c=relaxed/simple; bh=7jVGQKPm144eJ5e/wFuG3pH62gN353S64T519yaF2nI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=fpu9bxvAGlXHSbs/QI3DsiPWhRipD3Ce8O2yui5QNrpXLN1XZYwqf9oB4v49wQTblXFsP/bb5dXrai+jsNdh2ZMmeUs3eH51CPRj1AmjYKMLctVPFTLIoRXCQtkdSAuWM4kR24Ljw4/JvC+XRYKMb1Puxe+Q8IWIYFQd4iRS9Ak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 10e05436841711f1aa26b74ffac11d73-20260720 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM, HR_SJ_PHRASE HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT, HR_TO_NO_NAME IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_EXISTED, SN_EXISTED SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_GOOD, CIE_GOOD_SPF GTI_FG_BS, GTI_RG_INFO, GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:db08b1e7-6641-410f-aa9f-fd32539ba8b0,IP:15, URL:0,TC:0,Content:-5,EDM:25,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:35 X-CID-INFO: VERSION:1.3.12,REQID:db08b1e7-6641-410f-aa9f-fd32539ba8b0,IP:15,UR L:0,TC:0,Content:-5,EDM:25,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:35 X-CID-META: VersionHash:e7bac3a,CLOUDID:364d059062ff186c5ec2dfd66874473f,BulkI D:26072016432429EUH538,BulkQuantity:0,Recheck:0,SF:10|66|78|102|127|850|86 5|898,TC:nil,Content:0|15|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:nil,QS :nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,A RC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 10e05436841711f1aa26b74ffac11d73-20260720 X-User: yijiangshan@kylinos.cn Received: from localhost.localdomain [(116.128.244.171)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 171544367; Mon, 20 Jul 2026 16:43:22 +0800 From: Jiangshan Yi To: corey@minyard.net Cc: linux-kernel@vger.kernel.org, openipmi-developer@lists.sourceforge.net, 13667453960@163.com, Jiangshan Yi Subject: [PATCH] ipmi: watchdog: Convert strcmp if-else chains to match_string Date: Mon, 20 Jul 2026 16:42:48 +0800 Message-Id: <20260720084248.591631-1-yijiangshan@kylinos.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The action_op_set_val(), preaction_op_set_val() and preop_op_set_val() functions use chains of 'if (strcmp(...) =3D=3D 0) ... else if (...)' to match the user-supplied sysfs/preaction/preop string against the set of valid options. Replace each chain with a table-driven match_string() lookup that pairs the option name with its corresponding WDOG_* value. This removes the duplicated strcmp boilerplate and makes adding a new option a single-line change to both the names and values arrays. The preaction table preserves the existing #ifdef HAVE_DIE_NMI conditional for the "pre_nmi" entry. match_string() internally uses strcmp(), so the matching semantics are unchanged. Signed-off-by: Jiangshan Yi --- drivers/char/ipmi/ipmi_watchdog.c | 73 +++++++++++++++++++------------ 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_wat= chdog.c index a013ddbf1466..bdd609c57ee4 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -1146,18 +1146,22 @@ static struct ipmi_smi_watcher smi_watcher =3D { .smi_gone =3D ipmi_smi_gone }; =20 +static const char * const action_names[] =3D { + "reset", "none", "power_cycle", "power_off" +}; + +static const unsigned char action_vals[] =3D { + WDOG_TIMEOUT_RESET, WDOG_TIMEOUT_NONE, + WDOG_TIMEOUT_POWER_CYCLE, WDOG_TIMEOUT_POWER_DOWN +}; + static int action_op_set_val(const char *inval) { - if (strcmp(inval, "reset") =3D=3D 0) - action_val =3D WDOG_TIMEOUT_RESET; - else if (strcmp(inval, "none") =3D=3D 0) - action_val =3D WDOG_TIMEOUT_NONE; - else if (strcmp(inval, "power_cycle") =3D=3D 0) - action_val =3D WDOG_TIMEOUT_POWER_CYCLE; - else if (strcmp(inval, "power_off") =3D=3D 0) - action_val =3D WDOG_TIMEOUT_POWER_DOWN; - else + int idx =3D match_string(action_names, ARRAY_SIZE(action_names), inval); + + if (idx < 0) return -EINVAL; + action_val =3D action_vals[idx]; return 0; } =20 @@ -1176,20 +1180,30 @@ static int action_op(const char *inval, char *outva= l) return rv; } =20 -static int preaction_op_set_val(const char *inval) -{ - if (strcmp(inval, "pre_none") =3D=3D 0) - preaction_val =3D WDOG_PRETIMEOUT_NONE; - else if (strcmp(inval, "pre_smi") =3D=3D 0) - preaction_val =3D WDOG_PRETIMEOUT_SMI; +static const char * const preaction_names[] =3D { + "pre_none", "pre_smi", #ifdef HAVE_DIE_NMI - else if (strcmp(inval, "pre_nmi") =3D=3D 0) - preaction_val =3D WDOG_PRETIMEOUT_NMI; + "pre_nmi", #endif - else if (strcmp(inval, "pre_int") =3D=3D 0) - preaction_val =3D WDOG_PRETIMEOUT_MSG_INT; - else + "pre_int" +}; + +static const unsigned char preaction_vals[] =3D { + WDOG_PRETIMEOUT_NONE, WDOG_PRETIMEOUT_SMI, +#ifdef HAVE_DIE_NMI + WDOG_PRETIMEOUT_NMI, +#endif + WDOG_PRETIMEOUT_MSG_INT +}; + +static int preaction_op_set_val(const char *inval) +{ + int idx =3D match_string(preaction_names, ARRAY_SIZE(preaction_names), + inval); + + if (idx < 0) return -EINVAL; + preaction_val =3D preaction_vals[idx]; return 0; } =20 @@ -1208,16 +1222,21 @@ static int preaction_op(const char *inval, char *ou= tval) return 0; } =20 +static const char * const preop_names[] =3D { + "preop_none", "preop_panic", "preop_give_data" +}; + +static const unsigned char preop_vals[] =3D { + WDOG_PREOP_NONE, WDOG_PREOP_PANIC, WDOG_PREOP_GIVE_DATA +}; + static int preop_op_set_val(const char *inval) { - if (strcmp(inval, "preop_none") =3D=3D 0) - preop_val =3D WDOG_PREOP_NONE; - else if (strcmp(inval, "preop_panic") =3D=3D 0) - preop_val =3D WDOG_PREOP_PANIC; - else if (strcmp(inval, "preop_give_data") =3D=3D 0) - preop_val =3D WDOG_PREOP_GIVE_DATA; - else + int idx =3D match_string(preop_names, ARRAY_SIZE(preop_names), inval); + + if (idx < 0) return -EINVAL; + preop_val =3D preop_vals[idx]; return 0; } =20 --=20 2.25.1