diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
| commit | 6dabee73d46bfafb8c588b21b14606914de97ee6 (patch) | |
| tree | 140f679ec718d022e9946d8534af5cd7646340c6 /drivers/pci/hotplug | |
| parent | 78890b5989d96ddce989cde929c45ceeded0fcaf (diff) | |
| parent | 769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff) | |
| download | linux-stable-6dabee73d46bfafb8c588b21b14606914de97ee6.tar.gz linux-stable-6dabee73d46bfafb8c588b21b14606914de97ee6.tar.bz2 linux-stable-6dabee73d46bfafb8c588b21b14606914de97ee6.zip | |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
PCI: Drop bogus default from ARCH_SUPPORTS_MSI
PCI: cpqphp: Remove unreachable path
PCI: Remove bus number resource debug messages
PCI/AER: Print completion message at KERN_INFO to match starting message
PCI: Fix drivers/pci/pci.c kernel-doc warnings
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index e43908d9b5df..36112fe212d3 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c @@ -2890,27 +2890,8 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func func->mem_head = mem_node; } else return -ENOMEM; - } else if ((temp_register & 0x0BL) == 0x04) { - /* Map memory */ - base = temp_register & 0xFFFFFFF0; - base = ~base + 1; - - dbg("CND: length = 0x%x\n", base); - mem_node = get_resource(&(resources->mem_head), base); - - /* allocate the resource to the board */ - if (mem_node) { - base = mem_node->base; - - mem_node->next = func->mem_head; - func->mem_head = mem_node; - } else - return -ENOMEM; - } else if ((temp_register & 0x0BL) == 0x06) { - /* Those bits are reserved, we can't handle this */ - return 1; } else { - /* Requesting space below 1M */ + /* Reserved bits or requesting space below 1M */ return NOT_ENOUGH_RESOURCES; } |