diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-16 00:40:31 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 17:37:26 -0500 |
commit | 2069ecfbe14ebd71a6f98e8a00724e9adf4fe4ee (patch) | |
tree | 5a0328d6e545a6488e85face05b0a4d78676bedf /drivers/pci/setup-res.c | |
parent | 8474ecd9231434d71a39cd1ba118629e1b036137 (diff) |
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>
Diffstat (limited to 'drivers/pci/setup-res.c')
-rw-r--r-- | drivers/pci/setup-res.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index f968185aa192..eea85dafc763 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -114,7 +114,6 @@ int pci_claim_resource(struct pci_dev *dev, int resource) | |||
114 | } | 114 | } |
115 | EXPORT_SYMBOL(pci_claim_resource); | 115 | EXPORT_SYMBOL(pci_claim_resource); |
116 | 116 | ||
117 | #ifdef CONFIG_PCI_QUIRKS | ||
118 | void pci_disable_bridge_window(struct pci_dev *dev) | 117 | void pci_disable_bridge_window(struct pci_dev *dev) |
119 | { | 118 | { |
120 | dev_info(&dev->dev, "disabling bridge mem windows\n"); | 119 | dev_info(&dev->dev, "disabling bridge mem windows\n"); |
@@ -127,9 +126,6 @@ void pci_disable_bridge_window(struct pci_dev *dev) | |||
127 | pci_write_config_dword(dev, PCI_PREF_MEMORY_BASE, 0x0000fff0); | 126 | pci_write_config_dword(dev, PCI_PREF_MEMORY_BASE, 0x0000fff0); |
128 | pci_write_config_dword(dev, PCI_PREF_BASE_UPPER32, 0xffffffff); | 127 | pci_write_config_dword(dev, PCI_PREF_BASE_UPPER32, 0xffffffff); |
129 | } | 128 | } |
130 | #endif /* CONFIG_PCI_QUIRKS */ | ||
131 | |||
132 | |||
133 | 129 | ||
134 | static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, | 130 | static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, |
135 | int resno, resource_size_t size, resource_size_t align) | 131 | int resno, resource_size_t size, resource_size_t align) |