Merge branch 'pci/controller/artpec6'

bjorn-helgaas · bjorn-helgaas · commit 43f25adf9f27 · 2024-07-19T10:10:26.000-05:00
- Correct the artpec6_pcie_cpu_addr_fixup() parameter name, which takes a
  CPU address but called it "pci_addr" (Niklas Cassel)

* pci/controller/artpec6:
  PCI: artpec6: Fix artpec6_pcie_cpu_addr_fixup() parameter name
diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -94,21 +94,21 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u
 	regmap_write(artpec6_pcie->regmap, offset, val);
 }
 
-static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr)
+static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr)
 {
 	struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci);
 	struct dw_pcie_rp *pp = &pci->pp;
 	struct dw_pcie_ep *ep = &pci->ep;
 
 	switch (artpec6_pcie->mode) {
 	case DW_PCIE_RC_TYPE:
-		return pci_addr - pp->cfg0_base;
+		return cpu_addr - pp->cfg0_base;
 	case DW_PCIE_EP_TYPE:
-		return pci_addr - ep->phys_base;
+		return cpu_addr - ep->phys_base;
 	default:
 		dev_err(pci->dev, "UNKNOWN device type\n");
 	}
-	return pci_addr;
+	return cpu_addr;
 }
 
 static int artpec6_pcie_establish_link(struct dw_pcie *pci)

Original file line number	Diff line number	Diff line change
`@@ -94,21 +94,21 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u`
`94`	`94`	`regmap_write(artpec6_pcie->regmap, offset, val);`
`95`	`95`	`}`
`96`	`96`
`97`		`-static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr)`
	`97`	`+static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr)`
`98`	`98`	`{`
`99`	`99`	`struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci);`
`100`	`100`	`struct dw_pcie_rp *pp = &pci->pp;`
`101`	`101`	`struct dw_pcie_ep *ep = &pci->ep;`
`102`	`102`
`103`	`103`	`switch (artpec6_pcie->mode) {`
`104`	`104`	`case DW_PCIE_RC_TYPE:`
`105`		`- return pci_addr - pp->cfg0_base;`
	`105`	`+ return cpu_addr - pp->cfg0_base;`
`106`	`106`	`case DW_PCIE_EP_TYPE:`
`107`		`- return pci_addr - ep->phys_base;`
	`107`	`+ return cpu_addr - ep->phys_base;`
`108`	`108`	`default:`
`109`	`109`	`dev_err(pci->dev, "UNKNOWN device type\n");`
`110`	`110`	`}`
`111`		`- return pci_addr;`
	`111`	`+ return cpu_addr;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`static int artpec6_pcie_establish_link(struct dw_pcie *pci)`