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

Commit 21186728 authored by Rob Herring's avatar Rob Herring Committed by Bjorn Helgaas
Browse files

PCI: generic: Convert to use generic config accessors 



Convert the generic host PCI driver to use the generic config access
functions.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
CC: linux-arm-kernel@lists.infradead.org
parent b98fa508

drivers/pci/host/pci-host-generic.c

+3 −48
Original line number Diff line number Diff line
@@ -76,55 +76,9 @@ static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = { 
	.map_bus	= gen_pci_map_cfg_bus_ecam,

};



static int gen_pci_config_read(struct pci_bus *bus, unsigned int devfn,

				int where, int size, u32 *val)

{

	void __iomem *addr;

	struct pci_sys_data *sys = bus->sysdata;

	struct gen_pci *pci = sys->private_data;



	addr = pci->cfg.ops->map_bus(bus, devfn, where);



	switch (size) {

	case 1:

		*val = readb(addr);

		break;

	case 2:

		*val = readw(addr);

		break;

	default:

		*val = readl(addr);

	}



	return PCIBIOS_SUCCESSFUL;

}



static int gen_pci_config_write(struct pci_bus *bus, unsigned int devfn,

				 int where, int size, u32 val)

{

	void __iomem *addr;

	struct pci_sys_data *sys = bus->sysdata;

	struct gen_pci *pci = sys->private_data;



	addr = pci->cfg.ops->map_bus(bus, devfn, where);



	switch (size) {

	case 1:

		writeb(val, addr);

		break;

	case 2:

		writew(val, addr);

		break;

	default:

		writel(val, addr);

	}



	return PCIBIOS_SUCCESSFUL;

}



static struct pci_ops gen_pci_ops = {

	.read	= gen_pci_config_read,

	.write	= gen_pci_config_write,

	.read	= pci_generic_config_read,

	.write	= pci_generic_config_write,

};



static const struct of_device_id gen_pci_of_match[] = {
@@ -287,6 +241,7 @@ static int gen_pci_probe(struct platform_device *pdev) 


	of_id = of_match_node(gen_pci_of_match, np);

	pci->cfg.ops = of_id->data;

	gen_pci_ops.map_bus = pci->cfg.ops->map_bus;

	pci->host.dev.parent = dev;

	INIT_LIST_HEAD(&pci->host.windows);

	INIT_LIST_HEAD(&pci->resources);