From nobody Fri May 20 17:14:30 2022 X-Original-To: dev-commits-ports-main@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 8C9031B3450B; Fri, 20 May 2022 17:14:30 +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 4L4YHV35Mcz4j9x; Fri, 20 May 2022 17:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066870; 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=zb3Jun+kss6iuDmV5MWhcfQ7tLtCKvZB/OWHaMOrlck=; b=G84KZXvetaGtypihVvyEgZSC/qFC8Njz6JVBTz0Z5DfEg7c/5Sjr4y6fGzGz6Ad1IEI1Wj lMdEoaZDj7PTOe6c9n2XqE2pNShyogOFnZIXbsd6xd5jv89+iPGha/jiDAyTm4esLX5ZQa AuTtOY32SJDufRivsEBOhghLbS3/rY5m+7SpQvP2mMztgBvPYRh219qS3CU+kNDC8FucKV QwumC4VKemg6333qj16Xh4UOpNBdvo4OjvwclHAeyztrSSHi/rvCF2+xXuqE47O6e6hYrS 1ljd6Yol+Yl87kMTg7Um40m5GGOEsLG0n0mnrzNeb0M6+2H7KXXymihnVWU9IA== 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 3E0A716709; Fri, 20 May 2022 17:14:30 +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 24KHEUAH044396; Fri, 20 May 2022 17:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KHEU79044395; Fri, 20 May 2022 17:14:30 GMT (envelope-from git) Date: Fri, 20 May 2022 17:14:30 GMT Message-Id: <202205201714.24KHEU79044395@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: 7175e1ab5ff1 - main - comms/opencbm-kmod: Remove unused DRIVER_MODULE devclass on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 7175e1ab5ff183bd561a8b4c97f2941c84366a22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066870; 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=zb3Jun+kss6iuDmV5MWhcfQ7tLtCKvZB/OWHaMOrlck=; b=PzocnITt45sn4O45Jb27KCnvmpAWpeJCJRed/VvVM5f/2PZyIhEQQz3aMWhxrz3gewSJs6 QbmGqx7r93gttfhU5zfqlGrbrQqTzhuyBu57FqNXXoQyGRlK4aPgoJd60kY0RmdeBwkfVq qzqM2nfmANlroEEFS4/GjayI0wLNrizCIK6MrJCCwJrZxOWangCdj9pGFcfF3YI7cHHCaX zDX/NDTAHduiuAcFpt6/P2Z9NQm/Km6ZgR7AZpoVieqZ4V8pMBgVyQe2U8UglGzioFN6PE PC3dBnI6EpjrKFjewOxdDgT+u7hkCWc9/FmYulzPu/e7uqg+uE661BpYz8fSLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653066870; a=rsa-sha256; cv=none; b=ReWaXEOcjjJEG3+zA7xs0mr8hVQFDAvpKMbkki5NWW4iTi5nMIeetjO9c4CojXEAiSzzA/ VJSV6aLx4D9IVQ3LfW43SoQWAL3/2YbKV1RNtDOVeWBv5nKDsMtlU8aU+DhPyzcWYFxpIB LYnYO//TJXVXlqnrWvyhszqWnzU9AsdEDkSS/GVke/hzh4v12kYSZ7OsceznzO+AjduCSs InojWzWlW24uQrM+QheAopCQSurQ6TMI2/xDvsCD5cEdTs7zQ6jqSi7Y30POLjo2beSvKq sM/lsKxQpzEJ0Q/96/ffm77uO3KlzxR335rNMtxx4hhckK/2IUumvynmsoX9xw== 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=7175e1ab5ff183bd561a8b4c97f2941c84366a22 commit 7175e1ab5ff183bd561a8b4c97f2941c84366a22 Author: John Baldwin AuthorDate: 2022-05-20 17:10:09 +0000 Commit: John Baldwin CommitDate: 2022-05-20 17:10:25 +0000 comms/opencbm-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: Felix Palmen (maintainer) Differential Revision: https://reviews.freebsd.org/D35195 --- .../files/patch-opencbm_sys_freebsd_opencbm.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c b/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c new file mode 100644 index 000000000000..4495b8f9e936 --- /dev/null +++ b/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c @@ -0,0 +1,25 @@ +--- opencbm/sys/freebsd/opencbm.c.orig 2022-05-13 16:48:06 UTC ++++ opencbm/sys/freebsd/opencbm.c +@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = { + .d_name = CBM_NAME + }; + +-static devclass_t cbm_devclass; +- + /* forward references for parallel burst routines */ + int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus, + unsigned char *buffer); +@@ -930,7 +928,13 @@ static driver_t cbm_driver = { + sizeof(struct cbm_data) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0); ++#else ++static devclass_t cbm_devclass; ++ + DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0); ++#endif + MODULE_DEPEND(cbm, ppbus, 1, 1, 1); + + /*