From nobody Thu Feb 27 14:17:34 2025 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 4Z3YML2gkRz5qGFX; Thu, 27 Feb 2025 14:17:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3YML2D1Vz3xXW; Thu, 27 Feb 2025 14:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665854; 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=EUDEZhQcxZnjWG56B1tQAXwYAa1s9dJdZCY5MRIHG5s=; b=Q4bMrWk9lW3rae4dUI+WW3OlEG9/+OV6n9INukZuXJifzdBkWBUoLhr2PHQ2kaWl7iiZQB CxN2eDnpVRdIT0yM23UThRXixSMkGuLA+NMHszddEyKatQP2zDnpK3qLLUuMgo5rXRMiDw qvnz1GuvhbH+0VxZWLcrWRL4c2w7gF2VM5/DVF/I8jssLqzy6tYEpjMXeYYQfW4xKITqM7 ttzpqXK7yBcs9oOFsAl392Z2dxvXAJ9zPnnCiBpCGLwcIvfqQ8q8C2nVrltNZ/eC9yP9ny t363w3UmP914YmHKJ0xiJwYPLPd/0ehP5HGaCASwf1rhN+5jTLG3N2jOeh+Yjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665854; a=rsa-sha256; cv=none; b=Hun1SrbGefuFXDb7ezDTF39kZZHx+ntoj5SYdQWoCiS0LrO/tqC7fXZsbw912L2VjyNrkV SVq64Kcs43j1AKFcdcfghNZaJSTdf67wdd1PM3zX/NtOCX7BOYHA5oFRYecTZuQuVcAYop AON/P0fW/hplSK0mxmPGJh8TUJnqxxGmR6Ud3y8ssudh5awNEz4cJ5A1EJCOZyLAUjzBrg xMVIhQk/eOigZkAwieMWKmgtLCVl4t7/0exaJaKJhMHtjz3SnnhP0LD2Bi1n9+dnQX0ofZ B/6Nje32sGZ42UmIXaxUXVweW3XN/WQnhqlfw0H68RVWdf9F+0+ePOKSaYDo6g== 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=1740665854; 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=EUDEZhQcxZnjWG56B1tQAXwYAa1s9dJdZCY5MRIHG5s=; b=Q4pdg8tjjfsOU4kOgrSkviijqumage6dcv1ipUA8luhk8hN4j+Jul+kRs/iR0AiDxcR8Be 1Mbi5HtS8SuGgxPVWpjjKu7BYSW819XXd9et2TWslyJ8gbSv21gEHk9K5vTwSsmdsXQw3U bKduI51Y9oA16LCO7i5vp0r/B024HGwjaRU/Vz7PdlQlLSiy2nfDkXxCkewiGs1n9KjV1M m5CX5DjlUbIW9GzrDCismgEA/HKUWMXb8hurOVqlLdzRNZXmIB0KfauGA0KNXNJP3uAjX0 nuacSRhsFZj5716ME+6iXnrrPCjLFJqeqFAZ4sT9Vjq3K0iW6p0wwAtDUWRW5g== 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 4Z3YML1cTbzm7S; Thu, 27 Feb 2025 14:17:34 +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 51REHYxr017607; Thu, 27 Feb 2025 14:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHY3C017604; Thu, 27 Feb 2025 14:17:34 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:34 GMT Message-Id: <202502271417.51REHY3C017604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 59cec1382dd8 - stable/14 - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59cec1382dd81b816d4c98c185350b08b9d39fb3 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59cec1382dd81b816d4c98c185350b08b9d39fb3 commit 59cec1382dd81b816d4c98c185350b08b9d39fb3 Author: Jessica Clarke AuthorDate: 2024-08-08 22:35:09 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:24 +0000 pci: Renove #ifdef PCI_IOV from declarations now used unconditionally Fixes: 971c9f57d7e6 ("pci: Narrow the scope of recently-added PCI_IOV #ifdefs") (cherry picked from commit 104ee24349c033b63a50bd89ddc431a0d3ef9902) --- 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 d3dd41abdb62..f4164f32293b 100644 --- a/sys/dev/pci/pci_private.h +++ b/sys/dev/pci/pci_private.h @@ -65,16 +65,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;