]> git.karo-electronics.de Git - linux-beck.git/commitdiff
arm64: PCI: Add local struct device pointers
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 1 Dec 2016 17:33:57 +0000 (11:33 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Tue, 6 Dec 2016 19:45:48 +0000 (13:45 -0600)
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>
arch/arm64/kernel/pci.c

index acf38722457b1d24a4aad62f167cef415b1538c3..8183c9803206faa559ad321fd70ca5d26f21fb89 100644 (file)
@@ -121,6 +121,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 static struct pci_config_window *
 pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
 {
+       struct device *dev = &root->device->dev;
        struct resource *bus_res = &root->secondary;
        u16 seg = root->segment;
        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);
 
        if (!root->mcfg_addr) {
-               dev_err(&root->device->dev, "%04x:%pR ECAM region not found\n",
-                       seg, bus_res);
+               dev_err(dev, "%04x:%pR ECAM region not found\n", seg, bus_res);
                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.end = cfgres.start + resource_size(bus_res) * bsz - 1;
        cfgres.flags = IORESOURCE_MEM;
-       cfg = pci_ecam_create(&root->device->dev, &cfgres, bus_res,
-                             &pci_generic_ecam_ops);
+       cfg = pci_ecam_create(dev, &cfgres, bus_res, &pci_generic_ecam_ops);
        if (IS_ERR(cfg)) {
-               dev_err(&root->device->dev, "%04x:%pR error %ld mapping ECAM\n",
-                       seg, bus_res, PTR_ERR(cfg));
+               dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
+                       PTR_ERR(cfg));
                return NULL;
        }