Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50dd8c3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Clean up pci_map_rom() whitespace 



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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ac0c302a

drivers/pci/rom.c

+18 −19
Original line number Original line Diff line number Diff line
@@ -128,16 +128,16 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
	loff_t start;

	loff_t start;

	void __iomem *rom;

	void __iomem *rom;





		if (res->flags &

	if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {

			(IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {

		*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);

		*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);

		return (void __iomem *)(unsigned long)

		return (void __iomem *)(unsigned long)

			pci_resource_start(pdev, PCI_ROM_RESOURCE);

			pci_resource_start(pdev, PCI_ROM_RESOURCE);

		} else {

	}



	/* assign the ROM an address if it doesn't have one */

	/* assign the ROM an address if it doesn't have one */

			if (res->parent == NULL &&

	if (res->parent == NULL && pci_assign_resource(pdev, PCI_ROM_RESOURCE))

			    pci_assign_resource(pdev, PCI_ROM_RESOURCE))

		return NULL;

		return NULL;



	start = pci_resource_start(pdev, PCI_ROM_RESOURCE);

	start = pci_resource_start(pdev, PCI_ROM_RESOURCE);

	*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);

	*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);

	if (*size == 0)

	if (*size == 0)
@@ -146,7 +146,6 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
	/* Enable ROM space decodes */

	/* Enable ROM space decodes */

	if (pci_enable_rom(pdev))

	if (pci_enable_rom(pdev))

		return NULL;

		return NULL;

		}





	rom = ioremap(start, *size);

	rom = ioremap(start, *size);

	if (!rom) {

	if (!rom) {