From nobody Fri Apr 12 11:26:23 2024 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 4VGDlz2Wn7z5HD9w; Fri, 12 Apr 2024 11:26:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VGDlz22bSz4Ncq; Fri, 12 Apr 2024 11:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712921183; 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=kaVaOQPLmUwwcKWx1sAAd9QmQ08SDv3s1MnIOk2C5m4=; b=NmJyNjgmAFKTsseugqUAQMoIAdv+Nz1LBkQ2dk6lOsFZMtskyJnrJCm/z3bAVWuPpvUdAh vMbHhmno/ig8vOlh2sDnDt/MXyS6XvgTXMtr8cQZObLRc3DD/929+9M5JDuLSvaWjY5zGl kqYwFeEPhRCFtaSmvvKAAHfBGvXKDwjX7Es5Y31sFLx6tXF13nvxSt9qT/kWKBUxOyJ5su dCzERqCi01x9k/Qg4J8tBsWyOCy1bso8hOV8zeB7oUFOnTKaPrpV2TfJY2V2ZW1FuMZ0ds 7QomX59H5DoGveAhRecLr7ZsrwS71LbwWXwcRBEIOFWNvkXMSJHUSRrao6neEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712921183; a=rsa-sha256; cv=none; b=UtmGTOPz/eE3Ufl0YmeIa3Nyi9MWdLL8V+eNlsfPYh9T+KkN/ULaw1WoDlSLEvbox3pHOb xdF7xtv+Jdf7ox2OyZs2S8pWEpeNW43PHPXMYMzoJD25u9/mdhcL7uAm+B7b/vbMExuiQs 8nweCtGcpWC+26tzNWSTknEFJAdiLkWW0M1keu5i3tqjU2bAWYa+V8N8nRs4GRBIhzVGYY b1u5K2MbJ8bNG5j4VYvnOTTGp04zFylf/s/8b0o9yjItGDw9IqrkcO/ruMPVYZmFbqw1h2 0MFGfWWZTQwb4FjM0HRmDk6svRTcTalEmanAHwJQFknXTS7crY6Tpqrq4Lq8Dg== 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=1712921183; 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=kaVaOQPLmUwwcKWx1sAAd9QmQ08SDv3s1MnIOk2C5m4=; b=lu2hlAq+97xu6+EKU0926DhxGC1JAiHoiLvfJUDlIy7xIrcRgiBgR664rDl0cLipC8YJYD S9wOGNkD83C6lFM1hC8Nc/IpAj1e/AEK0FWjF5Aas/diiA790TKMJx/nxmP1iOBwrm+rad hV7rjmScN6fFePo3pGGslyT6B5q6VU0RJDcQY5bIwNbf1Dhi9nhuyRUB6dkCWfQhlMhvKM znWXN+d4icnK0nuI2taCb8bVFYNFnqxTRNBBhkqD2xyfdnQ4M78nZK234N509Wl07QX+4R oDhh9L3ooyzIXcquSomOoq3sCd9M0jqJOl6X7MtGHV1bLwXoNV+iYRYarWzkvg== 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 4VGDlz1WQrznC7; Fri, 12 Apr 2024 11:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43CBQNA3083203; Fri, 12 Apr 2024 11:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CBQNbv083200; Fri, 12 Apr 2024 11:26:23 GMT (envelope-from git) Date: Fri, 12 Apr 2024 11:26:23 GMT Message-Id: <202404121126.43CBQNbv083200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d4d5aed66a3f - stable/14 - LinuxKPI: Remove the temporary variable fileid from the macro request_module 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4d5aed66a3f4323cf23f1a849b98d8570b403bf Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d5aed66a3f4323cf23f1a849b98d8570b403bf commit d4d5aed66a3f4323cf23f1a849b98d8570b403bf Author: Zhenlei Huang AuthorDate: 2024-04-05 16:26:09 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-12 11:25:17 +0000 LinuxKPI: Remove the temporary variable fileid from the macro request_module The variable fileid stores the result from kern_kldload() but never gets used. Since the third parameter `*fileid` of kern_kldload() can be NULL, this unused variable can be safely removed. No functional change intended. Reviewed by: emaste, bz, #linuxkpi MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44583 (cherry picked from commit 317cc829ee227cfdffe7b25125c070112ce0c2f1) --- sys/compat/linuxkpi/common/include/linux/kmod.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index 278d64db9df3..b3cbe2ed2e02 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -39,9 +39,8 @@ #define request_module(...) \ ({\ char modname[128]; \ - int fileid; \ snprintf(modname, sizeof(modname), __VA_ARGS__); \ - kern_kldload(curthread, modname, &fileid); \ + kern_kldload(curthread, modname, NULL); \ }) #define request_module_nowait request_module