Skip to contentSkip to conversation

PCI: of_property: Rename struct of_pci_range to of_pci_range_entry

PATCH In review Bjorn Helgaas 2 participants 2 messages Jan 17, 2025 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: of_property: Rename struct of_pci_range to of_pci_range_entry

From: Bjorn Helgaas <[email protected]>

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.

---
 drivers/pci/of_property.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/of_property.c +2 -2
index 886c236e5de6..58fbafac7c6a 100644
@@ -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;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

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.

---
  drivers/pci/of_property.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/of_property.c +1 -1
index 886c236e5de6..58fbafac7c6a 100644
@@ -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];

drivers/pci/of_property.c static int of_pci_prop_bus_range(struct pci_dev *pdev, · line 107

Quoted 8 lines
drivers/pci/of_property.c +1 -1
@@ -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;