On Sat, Jan 10, 2015 at 02:34:46AM +0000, Rob Herring wrote: > Convert the generic host PCI driver to use the generic config access > functions. > > Signed-off-by: Rob Herring <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: Bjorn Helgaas <[email protected]> > Cc: [email protected] > Cc: [email protected] > --- > drivers/pci/host/pci-host-generic.c | 51 > +++---------------------------------- > 1 file changed, 3 insertions(+), 48 deletions(-)
Looks like a fairly straightforward conversion for this driver! Acked-by: Will Deacon <[email protected]> Will > diff --git a/drivers/pci/host/pci-host-generic.c > b/drivers/pci/host/pci-host-generic.c > index 6eb1aa7..925e29e 100644 > --- a/drivers/pci/host/pci-host-generic.c > +++ b/drivers/pci/host/pci-host-generic.c > @@ -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); > -- > 2.1.0 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
