summaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/pcie-hisi.c
diff options
context:
space:
mode:
authorBjorn Helgaas2017-02-07 15:41:09 +0100
committerBjorn Helgaas2017-02-09 16:13:20 +0100
commit4788316f743539076712d2b80b6cd289458fe2be (patch)
tree329c23817e7624c438340666758c4b7e940c4757 /drivers/pci/host/pcie-hisi.c
parentPCI: hisi: Add DT almost-ECAM support for Hip06/Hip07 host controllers (diff)
downloadkernel-qcow2-linux-4788316f743539076712d2b80b6cd289458fe2be.tar.gz
kernel-qcow2-linux-4788316f743539076712d2b80b6cd289458fe2be.tar.xz
kernel-qcow2-linux-4788316f743539076712d2b80b6cd289458fe2be.zip
PCI: hisi: Rename config space accessors to remove "acpi"
There's nothing ACPI-specific about the config space accessors hisi_pcie_acpi_rd_conf() and hisi_pcie_acpi_wr_conf(), and they're used for both the ACPI and the DT driver model. Rename them to hisi_pcie_rd_conf() and hisi_pcie_wr_conf(). No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/host/pcie-hisi.c')
-rw-r--r--drivers/pci/host/pcie-hisi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
index cf3338f3e4f0..02a4d66ca7ae 100644
--- a/drivers/pci/host/pcie-hisi.c
+++ b/drivers/pci/host/pcie-hisi.c
@@ -26,8 +26,8 @@
#if defined(CONFIG_PCI_HISI) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS))
-static int hisi_pcie_acpi_rd_conf(struct pci_bus *bus, u32 devfn, int where,
- int size, u32 *val)
+static int hisi_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
+ int size, u32 *val)
{
struct pci_config_window *cfg = bus->sysdata;
int dev = PCI_SLOT(devfn);
@@ -44,8 +44,8 @@ static int hisi_pcie_acpi_rd_conf(struct pci_bus *bus, u32 devfn, int where,
return pci_generic_config_read(bus, devfn, where, size, val);
}
-static int hisi_pcie_acpi_wr_conf(struct pci_bus *bus, u32 devfn,
- int where, int size, u32 val)
+static int hisi_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
+ int where, int size, u32 val)
{
struct pci_config_window *cfg = bus->sysdata;
int dev = PCI_SLOT(devfn);
@@ -112,8 +112,8 @@ struct pci_ecam_ops hisi_pcie_ops = {
.init = hisi_pcie_init,
.pci_ops = {
.map_bus = hisi_pcie_map_bus,
- .read = hisi_pcie_acpi_rd_conf,
- .write = hisi_pcie_acpi_wr_conf,
+ .read = hisi_pcie_rd_conf,
+ .write = hisi_pcie_wr_conf,
}
};
@@ -358,8 +358,8 @@ struct pci_ecam_ops hisi_pcie_platform_ops = {
.init = hisi_pcie_platform_init,
.pci_ops = {
.map_bus = hisi_pcie_map_bus,
- .read = hisi_pcie_acpi_rd_conf,
- .write = hisi_pcie_acpi_wr_conf,
+ .read = hisi_pcie_rd_conf,
+ .write = hisi_pcie_wr_conf,
}
};