From nobody Fri Apr 05 16:26:53 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 4VB3lx6bYnz5GmH8; Fri, 5 Apr 2024 16:26:53 +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 4VB3lx61Mtz4W0p; Fri, 5 Apr 2024 16:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334413; 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=rM8jdcwJagz6yWKwDQIVX6NRNmx5hj8pg831/eDjRMY=; b=sePVjwcHTKaShN76MsDJFAHXcQYZTnf8G7dR37EspiTDbsRwalZpqN+3MJVRQC6u7mKvNO Uy5A293nof0efAlb6oGtSwsyrb5x1LjlyKXx+Lm25QUmNi3suLyjFAgUtfH5lILDlC/LuH nqSgLVB4aAAN++XC+SCKft8NCVPnfPlFA0txhOjVtPYiCq16xTnmBTDFlUkbr9NWVLDNbI qpdz/CQFJA4cvnQnfvLOl6mjjLH0pHwg3V2LYjzG6tSdtKg15uTytbKj6ux11DoSjyu1tg awyswENLSV5UEgdhQ7giLE5X/BhWHnCVZaeZGcrV2Ase1YRAxnMLNifIe8PDcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712334413; a=rsa-sha256; cv=none; b=DkEUeuq0HchPxjbRCKcR3zgxCSjHEYWMr6AYb7oGtBne64QytG7ddzdRaUsOMxSYXhlhco 5BBYAvc1fPxlMeeeSRxaQ9CKHQ0VNUTxha0d/sIuQ/K55UbEa6HuI21pnjgNLnKikbQMR7 JIS32/St//UmtDezvsIRzL0Z4LjVvggiRX0P2SpuES4M6+Sds3mAe9vDGodNeGfyOn2Yor cVG1vblozvM2yglGY1snOqr+V+Otv0kB6MjCCOeJt4+kFG5XM4wjnGD2FIml6eNdhIzeK+ etCAcxVA/3KgwVKwOHK6n/sVMA3ZVvbnr2zY06fDo/8vaOu3DS7ITJreMKh5hg== 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=1712334413; 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=rM8jdcwJagz6yWKwDQIVX6NRNmx5hj8pg831/eDjRMY=; b=GegqtRnARBUZocgQy6fM2xj6fmC053biMwQxAQm68EKxCipSDZwaBJwPy6LTCYXxdyyQWW t1JCsZbt513F66JtdTr9XF3hB+d4W3u5Sw5XPQkOHpHFvN1a+57vTE0wdE+uIbBWyk3M2j N/cuhuWinA2zBMz5Y3pxvFBxFcM9bnWrB3SPY6OLb7jvAI59CYvoTcl6ewuNlXuPkSLtQR F7kLZ82aqc6Kp94bgQMKXEr605QySfbaqJSSD/iNCIaTcBL96jUEYe90Dh4bPLIqXNd2Rd 2+Sko6WYy8bkeo8nYldhFx/l7u3UG1gf6ebEAVBlSKkTLri7aYZe9gIF8tRFRA== 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 4VB3lx5Wp1z16Fk; Fri, 5 Apr 2024 16:26:53 +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 435GQrru097146; Fri, 5 Apr 2024 16:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435GQrgS097143; Fri, 5 Apr 2024 16:26:53 GMT (envelope-from git) Date: Fri, 5 Apr 2024 16:26:53 GMT Message-Id: <202404051626.435GQrgS097143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 317cc829ee22 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 317cc829ee227cfdffe7b25125c070112ce0c2f1 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=317cc829ee227cfdffe7b25125c070112ce0c2f1 commit 317cc829ee227cfdffe7b25125c070112ce0c2f1 Author: Zhenlei Huang AuthorDate: 2024-04-05 16:26:09 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-05 16:26:09 +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 --- 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