From nobody Mon May 23 14:24:55 2022 X-Original-To: dev-commits-src-main@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 418951B48187; Mon, 23 May 2022 14:24:56 +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 4L6KNS1Kh2z4XGK; Mon, 23 May 2022 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653315896; 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=J/xv58A1s9cyEvY73UGk6/EQTuX4DcvopG6DNpR7sB8=; b=MRFmN8t5lyEcXQLX5N4CAj4WXGcv7N/GsPoA6F//y55WzQclEDtiJGfBfJdIfq6RItmBQD LbdwmNwvo9KrEalii1MAdh+Xjn7H484187lend21/YH/dhpRoz4ruHRZKk8QlNF54OK5JK R/i1OwR+GzFvncBm1+LLxJ2AQx6Eg57gyicxrhDJBydXGFt/bk0csFf0qghSFMt8mB8wGu /EOFnT5NqGs85c4U/5jpiGAZr7rfTX5m0RjnjAgE8UmmloFpC6WyzQYwE+5O42eTgxhSqh t5xznjrNrsgm4+b7iqqFVs2Cz8e/qThr4CTHlAeczabdP5h+7PdU1jhh6bhJIw== 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 09A0F11AEB; Mon, 23 May 2022 14:24:56 +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 24NEOtCg061902; Mon, 23 May 2022 14:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NEOteM061901; Mon, 23 May 2022 14:24:55 GMT (envelope-from git) Date: Mon, 23 May 2022 14:24:55 GMT Message-Id: <202205231424.24NEOteM061901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ad52fba11e48 - main - Add fdt to name of a fdt specific function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad52fba11e482949afa687e455d3e6f698f8d584 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653315896; 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=J/xv58A1s9cyEvY73UGk6/EQTuX4DcvopG6DNpR7sB8=; b=jeZAT7cZqBVsBA2s2tC6M+OjxXxUlVRwgpsCTticXVzWUYDM10gNOpI0cEzOSilUUAP9tk SQMTeLza4aC5qvvPN7X9iOI6m1dj7G6soH9cbXVPCXowpoxG25+EJCkmNFre8RYWNBbCqV L90ry/vT3S4zjjU8MTxS1MAxkLPrpdOELla7Z32ze3Hu88xBUCTBOXAIgx4yuvn9+BGu2Z Lrf/vR1/09odZSY8UYVN8SQT/Ocv9XBt+Y0Dyu1ZW7UdSLW8TOtzSDBeAbUcHkm/pvCaNo a53+NVx12sHTjV2NhMucsC0ivqE1yG11E2QNUYksPJFSHCgLQcaarc3lg+eEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653315896; a=rsa-sha256; cv=none; b=dQHBwzUliqB41Yi4kplE7fnqNCdjI1Jr+bSZCUewQRb7CDbF5d3HVVBCVupYEb5Wa3XE4B o/ja798cqACS8vnwsovP02Yd2rMQyUsx//lfU+Cmz1Xd3VmvLH6agU6jvIa+EoPYt0/tfk btvyM/1JHG7K/oA357m2r0F4BTpJ4rvfvOVj9m+l6RVxt5IuOMhcxR6qCqijy3gbscc/hH 6oAr/UaVoaxRwtnQP6fvDzUl92uRNDc1X1K9gzyPnqQobBAOOO6IFvZdVYnEjrCYkRugZ5 02aikspRM6jU+u9VnotBpULUqHexRbTHBpFwkwfbD+VSDLL0uNwvBZ9i1xR6OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ad52fba11e482949afa687e455d3e6f698f8d584 commit ad52fba11e482949afa687e455d3e6f698f8d584 Author: Andrew Turner AuthorDate: 2022-05-23 13:50:03 +0000 Commit: Andrew Turner CommitDate: 2022-05-23 14:24:35 +0000 Add fdt to name of a fdt specific function Rename pci_host_generic_attach to pci_host_generic_fdt_attach to be consistant with the acpi attachment. Sponsored by: The FreeBSD Foundation --- sys/arm/annapurna/alpine/alpine_pci.c | 2 +- sys/arm64/cavium/thunder_pcie_fdt.c | 2 +- sys/dev/pci/pci_host_generic_fdt.c | 4 ++-- sys/dev/pci/pci_host_generic_fdt.h | 2 +- sys/dev/xilinx/xlnx_pcib.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/annapurna/alpine/alpine_pci.c b/sys/arm/annapurna/alpine/alpine_pci.c index d031587b5283..0245b6834f43 100644 --- a/sys/arm/annapurna/alpine/alpine_pci.c +++ b/sys/arm/annapurna/alpine/alpine_pci.c @@ -105,7 +105,7 @@ al_pcib_attach(device_t dev) { int rv; - rv = pci_host_generic_attach(dev); + rv = pci_host_generic_fdt_attach(dev); /* Annapurna quirk: configure vendor-specific registers */ if (rv == 0) diff --git a/sys/arm64/cavium/thunder_pcie_fdt.c b/sys/arm64/cavium/thunder_pcie_fdt.c index c0876b1a19bd..2c71efdbb659 100644 --- a/sys/arm64/cavium/thunder_pcie_fdt.c +++ b/sys/arm64/cavium/thunder_pcie_fdt.c @@ -205,7 +205,7 @@ thunder_pcie_fdt_attach(device_t dev) if (thunder_pcie_ofw_bus_attach(dev) != 0) return (ENXIO); - return (pci_host_generic_attach(dev)); + return (pci_host_generic_fdt_attach(dev)); } static int diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index 57ce03d0b94d..49c03625733c 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -164,7 +164,7 @@ pci_host_generic_setup_fdt(device_t dev) } int -pci_host_generic_attach(device_t dev) +pci_host_generic_fdt_attach(device_t dev) { int error; @@ -481,7 +481,7 @@ 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_attach), + 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), diff --git a/sys/dev/pci/pci_host_generic_fdt.h b/sys/dev/pci/pci_host_generic_fdt.h index a5d75eddc84d..65c50a772a92 100644 --- a/sys/dev/pci/pci_host_generic_fdt.h +++ b/sys/dev/pci/pci_host_generic_fdt.h @@ -48,7 +48,7 @@ DECLARE_CLASS(generic_pcie_fdt_driver); struct resource *pci_host_generic_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); int pci_host_generic_setup_fdt(device_t); -int pci_host_generic_attach(device_t); +int pci_host_generic_fdt_attach(device_t); int generic_pcie_get_id(device_t, device_t, enum pci_id_type, uintptr_t *); #endif /* __PCI_HOST_GENERIC_FDT_H_ */ diff --git a/sys/dev/xilinx/xlnx_pcib.c b/sys/dev/xilinx/xlnx_pcib.c index 50865d525267..2cba7f7f7282 100644 --- a/sys/dev/xilinx/xlnx_pcib.c +++ b/sys/dev/xilinx/xlnx_pcib.c @@ -396,7 +396,7 @@ xlnx_pcib_fdt_attach(device_t dev) if (error) return (error); - return (pci_host_generic_attach(dev)); + return (pci_host_generic_fdt_attach(dev)); } static int