PCI: Clean up pci_map_rom() whitespace
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 1 Mar 2016 17:13:30 +0000 (11:13 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 12 Mar 2016 12:00:28 +0000 (06:00 -0600)
Remove unnecessary indentation in pci_map_rom().  This is logically part of
the previous patch; I split it out to make the critical changes in that
patch more obvious.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/rom.c

index 80e82b1..2a07f34 100644 (file)
@@ -128,25 +128,24 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
        loff_t start;
        void __iomem *rom;
 
-               if (res->flags &
-                       (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {
-                       *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-                       return (void __iomem *)(unsigned long)
-                               pci_resource_start(pdev, PCI_ROM_RESOURCE);
-               } else {
-                       /* assign the ROM an address if it doesn't have one */
-                       if (res->parent == NULL &&
-                           pci_assign_resource(pdev, PCI_ROM_RESOURCE))
-                               return NULL;
-                       start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
-                       *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-                       if (*size == 0)
-                               return NULL;
-
-                       /* Enable ROM space decodes */
-                       if (pci_enable_rom(pdev))
-                               return NULL;
-               }
+       if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {
+               *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
+               return (void __iomem *)(unsigned long)
+                       pci_resource_start(pdev, PCI_ROM_RESOURCE);
+       }
+
+       /* assign the ROM an address if it doesn't have one */
+       if (res->parent == NULL && pci_assign_resource(pdev, PCI_ROM_RESOURCE))
+               return NULL;
+
+       start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
+       *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
+       if (*size == 0)
+               return NULL;
+
+       /* Enable ROM space decodes */
+       if (pci_enable_rom(pdev))
+               return NULL;
 
        rom = ioremap(start, *size);
        if (!rom) {