hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm64: PCI: Add local struct device pointers 

Use a local "struct device *dev" for brevity.  No functional change
intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
This commit is contained in:
Bjorn Helgaas 2016-12-01 11:33:57 -06:00 committed by Bjorn Helgaas
parent 00710984ea
commit dfd1972c2b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/kernel/pci.c
View File

@ -121,6 +121,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
static struct pci_config_window * static struct pci_config_window *
pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root) pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
{ {
struct device *dev = &root->device->dev;
struct resource *bus_res = &root->secondary; struct resource *bus_res = &root->secondary;
u16 seg = root->segment; u16 seg = root->segment;
struct pci_config_window *cfg; struct pci_config_window *cfg;
@ -132,8 +133,7 @@ pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
root->mcfg_addr = pci_mcfg_lookup(seg, bus_res); root->mcfg_addr = pci_mcfg_lookup(seg, bus_res);
if (!root->mcfg_addr) { if (!root->mcfg_addr) {
dev_err(&root->device->dev, "%04x:%pR ECAM region not found\n", dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);
seg, bus_res);
return NULL; return NULL;
} }
@ -141,11 +141,10 @@ pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
cfgres.start = root->mcfg_addr + bus_res->start * bsz; cfgres.start = root->mcfg_addr + bus_res->start * bsz;
cfgres.end = cfgres.start + resource_size(bus_res) * bsz - 1; cfgres.end = cfgres.start + resource_size(bus_res) * bsz - 1;
cfgres.flags = IORESOURCE_MEM; cfgres.flags = IORESOURCE_MEM;
cfg = pci_ecam_create(&root->device->dev, &cfgres, bus_res, cfg = pci_ecam_create(dev, &cfgres, bus_res, &pci_generic_ecam_ops);
&pci_generic_ecam_ops);
if (IS_ERR(cfg)) { if (IS_ERR(cfg)) {
dev_err(&root->device->dev, "%04x:%pR error %ld mapping ECAM\n", dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
seg, bus_res, PTR_ERR(cfg)); PTR_ERR(cfg));
return NULL; return NULL;
} }