aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-04 10:39:57 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-09-10 18:45:41 -0400
commitb161dabc3d3004ea56a8d20b0f5ec9bf68e67180 (patch)
treea73811ebe89bc2a7d08e13d51be6b669e5442063 /drivers/pci
parentf8ba65e8fbbc364b2a49d8713126fb345fe7ec65 (diff)
PCI: cpqphp: Remove unreachable path
register & 0x0B == 0x04 is never true, the code will always take the (identical) 0x00 path anyway. Remove the dead code paths. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44151 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/cpqphp_ctrl.c21
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
2890 func->mem_head = mem_node; 2890 func->mem_head = mem_node;
2891 } else 2891 } else
2892 return -ENOMEM; 2892 return -ENOMEM;
2893 } else if ((temp_register & 0x0BL) == 0x04) {
2894 /* Map memory */
2895 base = temp_register & 0xFFFFFFF0;
2896 base = ~base + 1;
2897
2898 dbg("CND: length = 0x%x\n", base);
2899 mem_node = get_resource(&(resources->mem_head), base);
2900
2901 /* allocate the resource to the board */
2902 if (mem_node) {
2903 base = mem_node->base;
2904
2905 mem_node->next = func->mem_head;
2906 func->mem_head = mem_node;
2907 } else
2908 return -ENOMEM;
2909 } else if ((temp_register & 0x0BL) == 0x06) {
2910 /* Those bits are reserved, we can't handle this */
2911 return 1;
2912 } else { 2893 } else {
2913 /* Requesting space below 1M */ 2894 /* Reserved bits or requesting space below 1M */
2914 return NOT_ENOUGH_RESOURCES; 2895 return NOT_ENOUGH_RESOURCES;
2915 } 2896 }
2916 2897