From owner-dev-commits-src-all@freebsd.org Fri Mar 26 15:01:45 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E43A5798A6; Fri, 26 Mar 2021 15:01:45 +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 4F6QD939M6z4nJQ; Fri, 26 Mar 2021 15:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5F9DC1C2A1; Fri, 26 Mar 2021 15:01:45 +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 12QF1jvo092400; Fri, 26 Mar 2021 15:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12QF1jak092399; Fri, 26 Mar 2021 15:01:45 GMT (envelope-from git) Date: Fri, 26 Mar 2021 15:01:45 GMT Message-Id: <202103261501.12QF1jak092399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f48c35fa1ea8 - main - ce: unifdef NPCI also MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f48c35fa1ea8e37812b315bd0dee17c88155de26 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2021 15:01:45 -0000 The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f48c35fa1ea8e37812b315bd0dee17c88155de26 commit f48c35fa1ea8e37812b315bd0dee17c88155de26 Author: Ed Maste AuthorDate: 2021-03-25 23:39:49 +0000 Commit: Ed Maste CommitDate: 2021-03-26 14:59:11 +0000 ce: unifdef NPCI also After f9839a42ee5d NPCI is always 1. Reported by: imp --- sys/dev/ce/if_ce.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index 9b3cff9adfeb..486397d2a2a9 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -20,10 +20,6 @@ __FBSDID("$FreeBSD$"); #include -# define NPCI 1 - -#if NPCI > 0 - #include #include #include @@ -2126,4 +2122,3 @@ DRIVER_MODULE (cemod, pci, ce_driver, ce_devclass, ce_modevent, NULL); #else DRIVER_MODULE (ce, pci, ce_driver, ce_devclass, ce_modevent, NULL); #endif -#endif /* NPCI */