PCI: Move "pci reassigndev resource alignment" out of quirks.c

This isn't really a quirk; calling it directly from pci_add_device makes
more sense.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 0 insertions, 63 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e198589d0990..f8f81d4f29ff 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -32,69 +32,6 @@
 #include "pci.h"
 
 /*
- * This quirk function disables memory decoding and releases memory resources
- * of the device specified by kernel's boot parameter 'pci=resource_alignment='.
- * It also rounds up size to specified alignment.
- * Later on, the kernel will assign page-aligned memory resource back
- * to the device.
- */
-static void __devinit quirk_resource_alignment(struct pci_dev *dev)
-{
-        int i;
-        struct resource *r;
-        resource_size_t align, size;
-        u16 command;
-
-        if (!pci_is_reassigndev(dev))
-                return;
-
-        if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
-            (dev->class >> 8) == PCI_CLASS_BRIDGE_HOST) {
-                dev_warn(&dev->dev,
-                        "Can't reassign resources to host bridge.\n");
-                return;
-        }
-
-        dev_info(&dev->dev,
-                "Disabling memory decoding and releasing memory resources.\n");
-        pci_read_config_word(dev, PCI_COMMAND, &command);
-        command &= ~PCI_COMMAND_MEMORY;
-        pci_write_config_word(dev, PCI_COMMAND, command);
-
-        align = pci_specified_resource_alignment(dev);
-        for (i=0; i < PCI_BRIDGE_RESOURCES; i++) {
-                r = &dev->resource[i];
-                if (!(r->flags & IORESOURCE_MEM))
-                        continue;
-                size = resource_size(r);
-                if (size < align) {
-                        size = align;
-                        dev_info(&dev->dev,
-                                "Rounding up size of resource #%d to %#llx.\n",
-                                i, (unsigned long long)size);
-                }
-                r->end = size - 1;
-                r->start = 0;
-        }
-        /* Need to disable bridge's resource window,
-         * to enable the kernel to reassign new resource
-         * window later on.
-         */
-        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
-            (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-                for (i = PCI_BRIDGE_RESOURCES; i < PCI_NUM_RESOURCES; i++) {
-                        r = &dev->resource[i];
-                        if (!(r->flags & IORESOURCE_MEM))
-                                continue;
-                        r->end = resource_size(r) - 1;
-                        r->start = 0;
-                }
-                pci_disable_bridge_window(dev);
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
-
-/*
  * Decoding should be disabled for a PCI device during BAR sizing to avoid
  * conflict. But doing so may cause problems on host bridge and perhaps other
  * key system devices. For devices that need to have mmio decoding always-on,