From nobody Mon Apr 08 19:04:33 2024 X-Original-To: dev-commits-src-branches@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 4VCz6T4C9gz5HYXx; Mon, 8 Apr 2024 19:04:33 +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 4VCz6T2L5cz4gNp; Mon, 8 Apr 2024 19:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603073; 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=MoKLe5OmuopajWI86N8ggn+me30j0tbVk5H2968ljM4=; b=oR0DSSfUXpMRp6ezd3hwHIBoFC42RlMJWoz4rs7R/d4HlQYfb7ain48UCXB9ytD2Co3zMY wTjg/qNcxZ3C94L5pLn6HmO7RQJU0r0jH3pnedzyc85AbBde0iVD+dUcpQUWwYUSzd71dn fYnaS3KHY1gEWEyqVg8UxcKoivtDk5Z/XlmRqSbb4xw/sDrWGMNNJVbWYfnj79gAw1vcQT bKHg9ij6pdc6HehzT0ANDx79nsiS6ni29tYF4DFdtl9ybrerpraUaMtf2dgQ94Q8ItwJ04 mvM38klREwetPuWayhfkezzhxZqJWWfDHITROz9x6PpIxaNyffDotVSqv12bLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603073; a=rsa-sha256; cv=none; b=phrNL5Zqj2YCuG+iu/dSw0d2Wry/mb6KDGc1noVIjYisg+gf7iTG6tnFU+qkPyPme203JT HijW1KV3Qnc6Rv2zgbdZW9ceY5cq77bPFQHBGAHbR0XxBc22vhFDR2ctgQFWJiXZdQ6DrX W4URGS/Sj2yM3xcLZRh+r1hTvR7kU+jMMiSlJwqlv4Fd8a7g2mrrfA246BSIup3NRWL0FT xcyV8ylqoV9fpAyfGpDbVi5jJCOBQCW0vtU1RA8wm0CkW6TEiFKUW//pLK6lYTmErSh02p g1/ySqOgwnh1AMN4K2BC//ynTGKzBLlqXHuCCu/zREZfquSW89W7+tOOfsHXTQ== 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=1712603073; 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=MoKLe5OmuopajWI86N8ggn+me30j0tbVk5H2968ljM4=; b=gNOFuqq0/9/335E2+O6eyJHmLwPVOd73eqQyoxaH3HV0ci7TdfTBcdcqfDva1PWbIouJoZ FghsHDjaspTYlTN9bohe4nvGMbDszyJVNXqg7VhPWgRWl2yvtb64rcy06TMckRRpHKPtQG FzKkdKOTV1mYrpME3MrquiHx/IBDORuyF9S5NFv4o4rR5HG2gjY61eC5Z1YWw2H0USSbK6 jqpMr8Yb/3QHLvrGlKIe/0belFJoR//9Z8sV9a8Sh1njqzNljUnjp36ZuzHIAHatrvhAWN GUrxBhVmmRr5GeThogd67kmYoSby1M0Yq7gobFsWxMyrxHteKc0pXcA1Us6elg== 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 4VCz6T1sTmzMx8; Mon, 8 Apr 2024 19:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4Xx2094456; Mon, 8 Apr 2024 19:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4Xes094453; Mon, 8 Apr 2024 19:04:33 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:33 GMT Message-Id: <202404081904.438J4Xes094453@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: 13926bcb9779 - stable/14 - pci_host_generic_fdt: Remove duplicate DEVMETHOD entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 13926bcb9779f8f2ba72ee25a094e179aa94d680 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=13926bcb9779f8f2ba72ee25a094e179aa94d680 commit 13926bcb9779f8f2ba72ee25a094e179aa94d680 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:55:37 +0000 pci_host_generic_fdt: Remove duplicate DEVMETHOD entries These are already inherited from generic_pcie_core_driver. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43888 (cherry picked from commit 93923685d35d95e76bd2c125c007e13354b9428c) --- sys/dev/pci/pci_host_generic_fdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index e910e946421f..bcee6057ff3c 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -480,8 +480,6 @@ generic_pcie_ofw_bus_attach(device_t dev) static device_method_t generic_pcie_fdt_methods[] = { DEVMETHOD(device_probe, generic_pcie_fdt_probe), DEVMETHOD(device_attach, pci_host_generic_fdt_attach), - DEVMETHOD(bus_alloc_resource, pci_host_generic_core_alloc_resource), - DEVMETHOD(bus_release_resource, pci_host_generic_core_release_resource), /* pcib interface */ DEVMETHOD(pcib_route_interrupt, generic_pcie_fdt_route_interrupt),