From: Changbin Du <changbin.du@intel.com>
Date: Wed, 8 Nov 2017 00:22:26 +0000 (-0600)
Subject: PCI: Move pci_map_rom() error path
X-Git-Tag: v4.19~2179^2~17^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a48a687d8cdf9a51a6283cc91f9637403b221ed3;p=platform%2Fkernel%2Flinux-rpi.git

PCI: Move pci_map_rom() error path

Move pci_map_rom() error code to the end to prepare for adding another
error path.  No functional change intended.

Signed-off-by: Changbin Du <changbin.du@intel.com>
[bhelgaas: split non-functional change into separate patch]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index b6edb187d160..0decf0d81cf5 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -147,12 +147,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
 		return NULL;
 
 	rom = ioremap(start, *size);
-	if (!rom) {
-		/* restore enable if ioremap fails */
-		if (!(res->flags & IORESOURCE_ROM_ENABLE))
-			pci_disable_rom(pdev);
-		return NULL;
-	}
+	if (!rom)
+		goto err_ioremap;
 
 	/*
 	 * Try to find the true size of the ROM since sometimes the PCI window
@@ -161,6 +157,12 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
 	 */
 	*size = pci_get_rom_size(pdev, rom, *size);
 	return rom;
+
+err_ioremap:
+	/* restore enable if ioremap fails */
+	if (!(res->flags & IORESOURCE_ROM_ENABLE))
+		pci_disable_rom(pdev);
+	return NULL;
 }
 EXPORT_SYMBOL(pci_map_rom);