From: Bjorn Helgaas Date: Fri, 17 Jan 2025 16:10:37 +0000 (-0600) Subject: PCI: of_property: Rename struct of_pci_range to of_pci_range_entry X-Git-Tag: v6.14-rc1~90^2~18^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42d9972732f77ced1b7a2406907b19d46c62bcf9;p=thirdparty%2Fkernel%2Flinux.git PCI: of_property: Rename struct of_pci_range to of_pci_range_entry Previously there were two definitions of struct of_pci_range: one in include/linux/of_address.h and another local to drivers/pci/of_property.c. Rename the local struct of_pci_range to of_pci_range_entry to avoid confusion. Link: https://lore.kernel.org/r/20250117161037.643953-1-helgaas@kernel.org Signed-off-by: Bjorn Helgaas Reviewed-by: Lizhi Hou --- diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index 886c236e5de6e..58fbafac7c6ac 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -26,7 +26,7 @@ struct of_pci_addr_pair { * side and the child address is the corresponding address on the secondary * side. */ -struct of_pci_range { +struct of_pci_range_entry { u32 child_addr[OF_PCI_ADDRESS_CELLS]; u32 parent_addr[OF_PCI_ADDRESS_CELLS]; u32 size[OF_PCI_SIZE_CELLS]; @@ -101,7 +101,7 @@ static int of_pci_prop_bus_range(struct pci_dev *pdev, static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, struct device_node *np) { - struct of_pci_range *rp; + struct of_pci_range_entry *rp; struct resource *res; int i, j, ret; u32 flags, num;