git: ad52fba11e48 - main - Add fdt to name of a fdt specific function

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=ad52fba11e482949afa687e455d3e6f698f8d584

commit ad52fba11e482949afa687e455d3e6f698f8d584
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-05-23 13:50:03 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
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