From nobody Fri May 20 17:14:34 2022 X-Original-To: dev-commits-ports-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 07C841B3426D; Fri, 20 May 2022 17:14:36 +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 4L4YHb0pmWz4j3R; Fri, 20 May 2022 17:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066875; 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=JX/QJWPJPJc8YxlsKyHaAIolgqPsLPI5+ezt+QCjoNg=; b=LbIW+0VgvzfO25RlxE7gyMpWTT92RpmhQwneKIpULYOS4tiGL9O/BUUKFJnK4Rol6TsZ1P Pmk5tal0PRkyMPXEX7nf+YDDinUEoLCy8c9lKMN0NaZQiwoV9yhlTnIKLZCAYr+uRuTFxn k7b9FjBpPLvmI/4aev4WYc/2QWxaA4YgX5UATBKQez2LZipnokcEC93kr3kfmGqs+5gNBz Ze3RcPZ817/odH9nYIHrC4f8ST4Wqgpi9m6ZlYPGlbVRgfAzH/9nDNB4qv5gmVKFJYAa6k mvVTLlWAXwnN8QQKtAu3Q8IbtopReBvFjKYBNihvmiQoN8L8w5PrvLJRcpHsDQ== 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 AB27B164F1; Fri, 20 May 2022 17:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24KHEYkr044499; Fri, 20 May 2022 17:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KHEYLJ044498; Fri, 20 May 2022 17:14:34 GMT (envelope-from git) Date: Fri, 20 May 2022 17:14:34 GMT Message-Id: <202205201714.24KHEYLJ044498@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 83d5518c672a - main - security/quantis-kmod: Remove unused DRIVER_MODULE devclass on recent main. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83d5518c672a77a47247866eaefd350af1b85ef4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066875; 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=JX/QJWPJPJc8YxlsKyHaAIolgqPsLPI5+ezt+QCjoNg=; b=pPlzTP0fXoggsEpdqqRPEW24pfDCoPLUhWXJCmI06DpQMsRIT7s9wbzoEC5GdVctRQ7Xz5 mzvrHghWg2QW/jB1DcBqnc5fy2nwS1ThDyc8qWgwIbotwA+HwCip3XakV68pLJBmWc2IJh sl/aHTDdNRx7bUDlP7EpaiCowzQWcttNsctTVZDN7jm2Qub3U2y0udXvRMP9vYvfW8k+cb KJ2ZaTHqVrNssbg9berm4C9hO4IVrBnH9T36ZHNJunDuVa+evB12v1B09xPgR3DSyuczqL bHilgRg6gZGg/KsTcoOibkIr4A0n7TSEeJ3YnEZapYRwrr9iSwg0O10wXRF8aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653066875; a=rsa-sha256; cv=none; b=dICrQf8cqqB9DiDZGkmuJDhmHMggNxc9o/QAoYlOnVSX2RnmOT5Y2vOzwOgs3jYcnVWxQO zCvPpYaMKXavwdqLYLJp+itSkBCNHxcQFx3eRPoU1f0XLYn472T/NSArQTs1nF1DgZDTyS 4CizFpQXZTpCN0qXxgUIFUkoYNF5QFzAx8M5kIVzx6OcyKRBTKzUQFhAsXX6EWwyvmSxHd lpC+DUZdkAB479ZK5SQAAgUjVsOL+0yBWiS3OkgyJawo96hV/MNcZ2JyQO27WwmYFhq8JD 4t+K8TkUa9QJdfEdmJ2iwEV7nFwcuF+DHgbEnuccovYmtGRjsv23IDbf2394Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=83d5518c672a77a47247866eaefd350af1b85ef4 commit 83d5518c672a77a47247866eaefd350af1b85ef4 Author: John Baldwin AuthorDate: 2022-05-20 17:14:05 +0000 Commit: John Baldwin CommitDate: 2022-05-20 17:14:05 +0000 security/quantis-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: ale (maintainer) Differential Revision: https://reviews.freebsd.org/D35265 --- .../files/patch-freebsd_quantis__pci__freebsd.c | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c b/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c index 1027ef172ab1..3d73996da1d8 100644 --- a/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c +++ b/security/quantis-kmod/files/patch-freebsd_quantis__pci__freebsd.c @@ -1,6 +1,29 @@ ---- freebsd/quantis_pci_freebsd.c.orig 2022-04-26 15:35:51 UTC +--- freebsd/quantis_pci_freebsd.c.orig 2017-07-20 14:51:35 UTC +++ freebsd/quantis_pci_freebsd.c -@@ -287,7 +287,6 @@ static int quantis_detach(device_t device, struct quan +@@ -147,8 +147,6 @@ static struct cdevsw quantis_cdevsw = + .d_name = "quantis", + }; + +-static devclass_t quantis_devclass; +- + /** Keep track of the numbers of card we manage for the corresponding + ** IOCTL call. I guess this is already managed in some `device_t' + ** structure. +@@ -200,7 +198,13 @@ static int quantis_load(struct module *module, int cmd + } + + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(quantis, pci, quantis_pci_driver, quantis_load, NULL); ++#else ++static devclass_t quantis_devclass; ++ + DRIVER_MODULE(quantis, pci, quantis_pci_driver, quantis_devclass, quantis_load, 0); ++#endif + + + static int quantis_pci_probe(device_t dev) +@@ -287,7 +291,6 @@ static int quantis_allocate_resources(device_t device) **/ static int quantis_allocate_resources(device_t device) { @@ -8,7 +31,7 @@ struct quantis_pci_device *scp = DEVICE2SOFTC(device); mtx_init(&scp->mutex, "Quantis Device Mutex", NULL, MTX_DEF); -@@ -301,7 +300,6 @@ static int quantis_allocate_resources(device_t device) +@@ -301,7 +304,6 @@ errexit: return (0); errexit: