Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4788316f authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent a2ec1996

drivers/pci/host/pcie-hisi.c

+8 −8
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#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,

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;
@@ -44,7 +44,7 @@ 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,

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;
@@ -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,

	}

};