From nobody Thu Aug 08 22:36:57 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 4Wg23F5PmBz5SSKQ; Thu, 08 Aug 2024 22:36:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wg23F4hcRz44Zc; Thu, 8 Aug 2024 22:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723156617; 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=UtCJgDnz0/A2EcGIz97x8mMr9BN/LihjUAXSbyX/e6U=; b=t8QI3W442kFvlPZGKeMIrFDNTYyQMhCnNH8nm886/Kcpue1jCjs++KtanVfuf59umAfhKj 601b7qqOX6/oC47prSroIs5U7b3bCtvkj51q76ivfNNCVOnHJt5h9iHbjF2Er7msOM745P MyGnTIo2EE4JO2S+0v843JcKoLiIaJ28xkOXxPNgqPRj2WCAyV242FDcuT7mk/PVN0knmw aw1al9zqlvLlA/ps8XXT+Th9MQ5vEsWrjzaJttljCPBPG4MukS3R2IYlDL0rTEV72ckF/t v36WyQlXLUqO9fq4mhQTytfI9tPJUywYdRmPrgjt2LuJ7Nq103qgF3q/W45Ibg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723156617; a=rsa-sha256; cv=none; b=V7a+XWXVzWpOzunC/Z3DS1i0/jQnrR9lUMxRM7e5X9SREn8Nc3GPHzFBnpCvuiw3TtphoM /6Hc4KmvGjOcFM+vp2tgBf+BSbg5K2O11KzIt90et8PVk6Si/7sZZntjoEQThs+KGUcnEe OZYdUrQvjH9nL8HuMfZ57wMzNAtqOnoFJryXuk0W8z5dzdozpDEbYq6wPAlgJe9SvdwehM hKaK0rJ2iSYEg9EMraKlbRSAvMtOYtOBZAQXlnxEJZxxWkqmj6krrpPygYzjeKFheznmFD upvCAaXn4lVOjUC4ZmcHITw+03N5Rr/K8sosO2SerTcVDC+qktwDEJ/fdnuNKQ== 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=1723156617; 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=UtCJgDnz0/A2EcGIz97x8mMr9BN/LihjUAXSbyX/e6U=; b=sKzvy2omKWSolv928oHb5OJoBewaqlrjnTbwztFeFaYnk6rZ56/6KqH2cc+gAHAsna9pM0 qJMYlvXVoGvERX8Zyzdnd3CzOL2InNCh2+FJaCvu79DT8owk5oX1zAvh+7lNNufAPo/AwZ rpkYHA9PmqKmxTuVCuIK9bgDE7fqOCzY8VbwQbSDIk6wdVU34sRLVdAnOvGBe/lL9JQGng D+MbzjnOIFWsQG9s07kWc3QcW3rF875U9IE/RFWmo8ax04Q2i27Mzl3fPok+jzVqG1VLJt 9+WcB4dYeLuzia865NqxVtFgZVwIzYpFy7OUSbFOuE+Id614VJGydh5hevTlSQ== 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 4Wg23F49wJzqyM; Thu, 8 Aug 2024 22:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 478MavEv071142; Thu, 8 Aug 2024 22:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 478MavVT071139; Thu, 8 Aug 2024 22:36:57 GMT (envelope-from git) Date: Thu, 8 Aug 2024 22:36:57 GMT Message-Id: <202408082236.478MavVT071139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 104ee24349c0 - main - pci: Renove #ifdef PCI_IOV from declarations now used unconditionally 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 104ee24349c033b63a50bd89ddc431a0d3ef9902 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=104ee24349c033b63a50bd89ddc431a0d3ef9902 commit 104ee24349c033b63a50bd89ddc431a0d3ef9902 Author: Jessica Clarke AuthorDate: 2024-08-08 22:35:09 +0000 Commit: Jessica Clarke CommitDate: 2024-08-08 22:35:09 +0000 pci: Renove #ifdef PCI_IOV from declarations now used unconditionally Fixes: 971c9f57d7e6 ("pci: Narrow the scope of recently-added PCI_IOV #ifdefs") --- sys/dev/pci/pci_private.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h index 3a114734c06f..3577c04d7043 100644 --- a/sys/dev/pci/pci_private.h +++ b/sys/dev/pci/pci_private.h @@ -63,16 +63,12 @@ bus_get_dma_tag_t pci_get_dma_tag; bus_get_resource_list_t pci_get_resource_list; bus_delete_resource_t pci_delete_resource; bus_alloc_resource_t pci_alloc_resource; -#ifdef PCI_IOV bus_adjust_resource_t pci_adjust_resource; -#endif bus_release_resource_t pci_release_resource; bus_activate_resource_t pci_activate_resource; bus_deactivate_resource_t pci_deactivate_resource; -#ifdef PCI_IOV bus_map_resource_t pci_map_resource; bus_unmap_resource_t pci_unmap_resource; -#endif bus_child_deleted_t pci_child_deleted; bus_child_detached_t pci_child_detached; bus_child_pnpinfo_t pci_child_pnpinfo_method;