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: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 8a280e9c2ad1e00b1cca15b4592d79c7460e1363..6b66329a6bff37c01fa0e39fac67225e90dd97fd 100644 (file)
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -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)

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 2a07f344616e784a20519151325e907c8f5b58f9..06663d391b393782de79260c8ae4addc46983535 100644 (file)
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -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

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 2cf16673f17a47d45c4b2a63b0b8af437b4bbb6a..29a6deb9f054c4d2839d356a3dab83986aa6c62b 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -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 */