From nobody Tue Apr 29 11:42:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zmz1v1mfSz5tvCr; Tue, 29 Apr 2025 11:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1t5DZkz3xMn; Tue, 29 Apr 2025 11:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZ+Ju7gE8P6e9ndIvOyCwnYAEVVjNbRCw8EKMgNVCnQ=; b=pWA0Vzg3V342apsJH5SV6hnx4BES55ZWVekhlXuQXxmrKPM7oXOargpauBUNo9ipKBmmNC yzRuIjGz/XtOqjre405IrjODOmCyVFKox1UbW10ISw1pA5DR3k826vXpgppB5+1Fx7YKwr 13CdQSYZqju/kjcGyy1KQE0Jiu5k/ZUdEry6vbrjJzSoKYE+ilkk3KNjXr8cF984dbhdo4 iM+xfWhR/aFXu3PvtvF6uwGwTaYauBZZJMFmC66wXYOHkjpjEJEoIALU04Nx5YYVUNaMh1 nISpnvzV/Wbrkd+isnBxZoXA12p8FASztU+ckpHNdSNKmgbj/KWDZeydiBO8wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926930; a=rsa-sha256; cv=none; b=pCTjFIHPayoiI3KJnGEwMBwWmSvrib0Q8sKeEnJTfFMy6PKfY5AaEnl5flSLQlkJJqGXvv zndDn8xtwGvq6iNUOSobJaZ9LfkpOXcVQA3jIqWUVQREEF8+FcLvXflQoL3O/KIObCaYiy MND70Z4xVSmvAA0rJxlrAo1KubvN2RqCHKpYGHGU8UjpG66C3Jjjg9Ee44t/S2gA0SGp1S vpjIYjeyvgQItsiKE8Oe1TWuCHbyZb6ff7UxM9DBFe3rmB9kUVQieRNGYuiwWay3hK4njF OZ6NPEcEnItCPT77x/4gkqYlWrsH2WVynit63Cmo7Y3tWyx3QpCO61zFIgk1pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZ+Ju7gE8P6e9ndIvOyCwnYAEVVjNbRCw8EKMgNVCnQ=; b=kYBq2wewL3yVenuKXKGsvB93VSrpo73A2yXzPSq0jFRNaI+YmLnA1WQDWyB6xAnw/CjnHn 683rRTN1FuLji7TZletcyPvT4wmHJUW+CGo9k1VekzrZ3szzf+sebv3Ye9Dbf04hIbnkU4 iXG/wN6ns72bEEwLQ2I1u05lFJc6FUCe2uPf/zQLkkdNGj6t2pGX0zHaioXwgLMrJ/Ug4S ahAQ9kI7jpR5/BKLs2h+hgVU7P8BRwXO8KzJiKd1Am+QYfIYlaQi1fcPqMKIRGVgc/0Q8r gPZ2uqrZD7VnT7vlK8KRhJsNssNjQnHfmYauUIr1AcXZDw8cFeKqAeLiDvDOeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zmz1t4mPkz474; Tue, 29 Apr 2025 11:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TBgAcU049147; Tue, 29 Apr 2025 11:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBgAuO049144; Tue, 29 Apr 2025 11:42:10 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:42:10 GMT Message-Id: <202504291142.53TBgAuO049144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 85bd58055f8b - stable/14 - LinuxKPI: sysfs: implement sysfs_match_string() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85bd58055f8b244584ddc6188c1770fb0246e28d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=85bd58055f8b244584ddc6188c1770fb0246e28d commit 85bd58055f8b244584ddc6188c1770fb0246e28d Author: Bjoern A. Zeeb AuthorDate: 2025-04-24 14:09:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:33 +0000 LinuxKPI: sysfs: implement sysfs_match_string() Use a macro to automatically gather the length of the array while we can. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50007 (cherry picked from commit f94d7319540b9b2256be60c2c666efe0b6e635ef) --- sys/compat/linuxkpi/common/include/linux/sysfs.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h index b5ad73e4460b..67aab7703dc7 100644 --- a/sys/compat/linuxkpi/common/include/linux/sysfs.h +++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h @@ -348,6 +348,24 @@ sysfs_emit_at(char *buf, int at, const char *fmt, ...) return (i); } +static inline int +_sysfs_match_string(const char * const *a, size_t l, const char *s) +{ + const char *p; + int i; + + for (i = 0; i < l; i++) { + p = a[i]; + if (p == NULL) + break; + if (sysfs_streq(p, s)) + return (i); + } + + return (-ENOENT); +} +#define sysfs_match_string(a, s) _sysfs_match_string(a, ARRAY_SIZE(a), s) + #define sysfs_attr_init(attr) do {} while(0) #endif /* _LINUXKPI_LINUX_SYSFS_H_ */