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

PCI: Remove unused IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY 



The IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY bits are unused.
Remove them and code that depends on them.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 97f47e73

drivers/pci/remove.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ static void pci_free_resources(struct pci_dev *dev) 
{

	int i;



	pci_cleanup_rom(dev);

	for (i = 0; i < PCI_NUM_RESOURCES; i++) {

		struct resource *res = dev->resource + i;

		if (res->parent)

drivers/pci/rom.c

+1 −30
Original line number Diff line number Diff line
@@ -128,12 +128,6 @@ 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);

	}



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

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

		return NULL;
@@ -150,8 +144,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
	rom = ioremap(start, *size);

	if (!rom) {

		/* restore enable if ioremap fails */

		if (!(res->flags & (IORESOURCE_ROM_ENABLE |

				    IORESOURCE_ROM_COPY)))

		if (!(res->flags & IORESOURCE_ROM_ENABLE))

			pci_disable_rom(pdev);

		return NULL;

	}
@@ -177,9 +170,6 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom) 
{

	struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];



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

		return;



	iounmap(rom);



	/* Disable again before continuing */
@@ -188,25 +178,6 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom) 
}

EXPORT_SYMBOL(pci_unmap_rom);



/**

 * pci_cleanup_rom - free the ROM copy created by pci_map_rom_copy

 * @pdev: pointer to pci device struct

 *

 * Free the copied ROM if we allocated one.

 */

void pci_cleanup_rom(struct pci_dev *pdev)

{

	struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];



	if (res->flags & IORESOURCE_ROM_COPY) {

		kfree((void *)(unsigned long)res->start);

		res->flags |= IORESOURCE_UNSET;

		res->flags &= ~IORESOURCE_ROM_COPY;

		res->start = 0;

		res->end = 0;

	}

}



/**

 * pci_platform_rom - provides a pointer to any ROM image provided by the

 * platform

include/linux/ioport.h

+0 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ struct resource { 
/* PCI ROM control bits (IORESOURCE_BITS) */

#define IORESOURCE_ROM_ENABLE		(1<<0)	/* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */

#define IORESOURCE_ROM_SHADOW		(1<<1)	/* Use RAM image, not ROM BAR */

#define IORESOURCE_ROM_COPY		(1<<2)	/* ROM is alloc'd copy, resource field overlaid */

#define IORESOURCE_ROM_BIOS_COPY	(1<<3)	/* ROM is BIOS copy, resource field overlaid */



/* PCI control bits.  Shares IORESOURCE_BITS with above PCI ROM.  */

#define IORESOURCE_PCI_FIXED		(1<<4)	/* Do not move resource */