Merge branch 'pci/controller/dra7xx'

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

* pci/controller/dra7xx:
  PCI: dra7xx: Fix dra7xx_pcie_cpu_addr_fixup() parameter name
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -113,9 +113,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset,
 	writel(value, pcie->base + offset);
 }
 
-static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr)
+static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr)
 {
-	return pci_addr & DRA7XX_CPU_TO_BUS_ADDR;
+	return cpu_addr & DRA7XX_CPU_TO_BUS_ADDR;
 }
 
 static int dra7xx_pcie_link_up(struct dw_pcie *pci)

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset,`
`113`	`113`	`writel(value, pcie->base + offset);`
`114`	`114`	`}`
`115`	`115`
`116`		`-static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr)`
	`116`	`+static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr)`
`117`	`117`	`{`
`118`		`- return pci_addr & DRA7XX_CPU_TO_BUS_ADDR;`
	`118`	`+ return cpu_addr & DRA7XX_CPU_TO_BUS_ADDR;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`static int dra7xx_pcie_link_up(struct dw_pcie *pci)`