@@ -82,17 +82,6 @@ static void dra7xx_writel(struct dra7xx_pcie *dra7xx, u32 offset, u32 value)
writel(value, dra7xx->base + offset);
}
-static u32 dra7xx_pcie_readl_rc(struct dra7xx_pcie *dra7xx, u32 offset)
-{
- return readl(dra7xx->pp.dbi_base + offset);
-}
-
-static void dra7xx_pcie_writel_rc(struct dra7xx_pcie *dra7xx, u32 offset,
- u32 value)
-{
- writel(value, dra7xx->pp.dbi_base + offset);
-}
-
static int dra7xx_pcie_link_up(struct pcie_port *pp)
{
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);
@@ -448,9 +437,9 @@ static int dra7xx_pcie_suspend(struct device *dev)
u32 val;
/* clear MSE */
- val = dra7xx_pcie_readl_rc(dra7xx, PCI_COMMAND);
+ val = dw_pcie_readl_rc(&dra7xx->pp, PCI_COMMAND);
val &= ~PCI_COMMAND_MEMORY;
- dra7xx_pcie_writel_rc(dra7xx, PCI_COMMAND, val);
+ dw_pcie_writel_rc(&dra7xx->pp, PCI_COMMAND, val);
return 0;
}
@@ -461,9 +450,9 @@ static int dra7xx_pcie_resume(struct device *dev)
u32 val;
/* set MSE */
- val = dra7xx_pcie_readl_rc(dra7xx, PCI_COMMAND);
+ val = dw_pcie_readl_rc(&dra7xx->pp, PCI_COMMAND);
val |= PCI_COMMAND_MEMORY;
- dra7xx_pcie_writel_rc(dra7xx, PCI_COMMAND, val);
+ dw_pcie_writel_rc(&dra7xx->pp, PCI_COMMAND, val);
return 0;
}
The dw_pcie_readl_rc() and dw_pcie_writel_rc() interfaces do the same as dra7xx_pcie_readl_rc() and dra7xx_pcie_writel_rc(), and they also give us a clue that we're using the DesignWare-generic functionality. Use the dw_*() interfaces and remove the dra7xx-specific ones. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/host/pci-dra7xx.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html