From 4a6134dfcbd508b601361633a13fafe4ef957caa Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 25 Nov 2019 12:03:02 +0100 Subject: PCI: dwc: rename readl/writel_dbi ops to read/write_dbi struct dw_pcie_ops read/writel_dbi functions can read values of any size, so with readl/writel they are misnamed. Rename them to read/write which also matches the kernel driver. Signed-off-by: Sascha Hauer --- drivers/pci/pcie-designware.c | 16 ++++++++-------- drivers/pci/pcie-designware.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pcie-designware.c b/drivers/pci/pcie-designware.c index 1da0947414..72deeee4ed 100644 --- a/drivers/pci/pcie-designware.c +++ b/drivers/pci/pcie-designware.c @@ -70,8 +70,8 @@ u32 dw_pcie_read_dbi(struct dw_pcie *pci, u32 reg, size_t size) int ret; u32 val; - if (pci->ops->readl_dbi) - return pci->ops->readl_dbi(pci, pci->dbi_base, reg, size); + if (pci->ops->read_dbi) + return pci->ops->read_dbi(pci, pci->dbi_base, reg, size); ret = dw_pcie_read(pci->dbi_base + reg, size, &val); if (ret) @@ -84,8 +84,8 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val) { int ret; - if (pci->ops->writel_dbi) { - pci->ops->writel_dbi(pci, pci->dbi_base, reg, size, val); + if (pci->ops->write_dbi) { + pci->ops->write_dbi(pci, pci->dbi_base, reg, size, val); return; } @@ -99,8 +99,8 @@ u32 dw_pcie_read_atu(struct dw_pcie *pci, u32 reg, size_t size) int ret; u32 val; - if (pci->ops->readl_dbi) - return pci->ops->readl_dbi(pci, pci->atu_base, reg, size); + if (pci->ops->read_dbi) + return pci->ops->read_dbi(pci, pci->atu_base, reg, size); ret = dw_pcie_read(pci->atu_base + reg, size, &val); if (ret) @@ -113,8 +113,8 @@ void dw_pcie_write_atu(struct dw_pcie *pci, u32 reg, size_t size, u32 val) { int ret; - if (pci->ops->writel_dbi) { - pci->ops->writel_dbi(pci, pci->atu_base, reg, size, val); + if (pci->ops->write_dbi) { + pci->ops->write_dbi(pci, pci->atu_base, reg, size, val); return; } diff --git a/drivers/pci/pcie-designware.h b/drivers/pci/pcie-designware.h index 1ffeaa8d1d..449c72aeaa 100644 --- a/drivers/pci/pcie-designware.h +++ b/drivers/pci/pcie-designware.h @@ -155,10 +155,10 @@ struct pcie_port { }; struct dw_pcie_ops { - u32 (*readl_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg, - size_t size); - void (*writel_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg, - size_t size, u32 val); + u32 (*read_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg, + size_t size); + void (*write_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg, + size_t size, u32 val); int (*link_up)(struct dw_pcie *pcie); }; -- cgit v1.2.3