From owner-dev-commits-src-main@freebsd.org Fri Jun 18 22:55:27 2021 Return-Path: Delivered-To: dev-commits-src-main@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 BC89164EC2A; Fri, 18 Jun 2021 22:55:27 +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 4G6Dlz50Jnz3hMF; Fri, 18 Jun 2021 22:55:27 +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 939D12F5D; Fri, 18 Jun 2021 22:55:27 +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 15IMtRCR062154; Fri, 18 Jun 2021 22:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15IMtRqO062153; Fri, 18 Jun 2021 22:55:27 GMT (envelope-from git) Date: Fri, 18 Jun 2021 22:55:27 GMT Message-Id: <202106182255.15IMtRqO062153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5f88df77a6a0 - main - LinuxKPI: fix build after d4a4960c655 pci: "pcim" (managed) support MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f88df77a6a0c7609700e2f2c35b0dbcb211f1bb Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 22:55:27 -0000 The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f88df77a6a0c7609700e2f2c35b0dbcb211f1bb commit 5f88df77a6a0c7609700e2f2c35b0dbcb211f1bb Author: Bjoern A. Zeeb AuthorDate: 2021-06-18 22:49:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-06-18 22:49:12 +0000 LinuxKPI: fix build after d4a4960c655 pci: "pcim" (managed) support Fix a last minute change from d4a4960c6559caa890af0901a21296e75b961210 based on review feedback in where a function now gets called before it is declared which did not fully get merged back to my commit branch. Noticed by: CI, jkim MFC after: 10 days X-MFC with: d4a4960c6559caa890af0901a21296e75b961210 Sponsored-by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/src/linux_pci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 5711296b6d1f..c35d259a45be 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -217,6 +217,14 @@ linux_pci_find(device_t dev, const struct pci_device_id **idp) return (NULL); } +static void +lkpi_pci_dev_release(struct device *dev) +{ + + lkpi_devres_release_free_list(dev); + spin_lock_destroy(&dev->devres_lock); +} + static void lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) { @@ -301,14 +309,6 @@ lkpi_pci_get_domain_bus_and_slot(int domain, unsigned int bus, return (pdev); } -static void -lkpi_pci_dev_release(struct device *dev) -{ - - lkpi_devres_release_free_list(dev); - spin_lock_destroy(&dev->devres_lock); -} - static int linux_pci_probe(device_t dev) {