From: Bjorn Helgaas <bhelgaas@google.com>

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.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/of_property.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
index 886c236e5de6..58fbafac7c6a 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;
-- 
2.34.1

On 1/17/25 08:10, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> 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.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>   drivers/pci/of_property.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
> index 886c236e5de6..58fbafac7c6a 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;
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>