aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/ibmphp_core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_core.c')
-rw-r--r--drivers/pci/hotplug/ibmphp_core.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 5794057f7ec1..f7b8684a7739 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -1045,8 +1045,7 @@ static int enable_slot(struct hotplug_slot *hs)
1045 rc = check_limitations(slot_cur); 1045 rc = check_limitations(slot_cur);
1046 if (rc) { 1046 if (rc) {
1047 err("Adding this card exceeds the limitations of this bus.\n"); 1047 err("Adding this card exceeds the limitations of this bus.\n");
1048 err("(i.e., >1 133MHz cards running on same bus, or " 1048 err("(i.e., >1 133MHz cards running on same bus, or >2 66 PCI cards running on same bus.\n");
1049 ">2 66 PCI cards running on same bus.\n");
1050 err("Try hot-adding into another bus\n"); 1049 err("Try hot-adding into another bus\n");
1051 rc = -EINVAL; 1050 rc = -EINVAL;
1052 goto error_nopower; 1051 goto error_nopower;
@@ -1070,12 +1069,10 @@ static int enable_slot(struct hotplug_slot *hs)
1070 !(SLOT_PWRGD(slot_cur->status))) 1069 !(SLOT_PWRGD(slot_cur->status)))
1071 err("power fault occurred trying to power up\n"); 1070 err("power fault occurred trying to power up\n");
1072 else if (SLOT_BUS_SPEED(slot_cur->status)) { 1071 else if (SLOT_BUS_SPEED(slot_cur->status)) {
1073 err("bus speed mismatch occurred. please check " 1072 err("bus speed mismatch occurred. please check current bus speed and card capability\n");
1074 "current bus speed and card capability\n");
1075 print_card_capability(slot_cur); 1073 print_card_capability(slot_cur);
1076 } else if (SLOT_BUS_MODE(slot_cur->ext_status)) { 1074 } else if (SLOT_BUS_MODE(slot_cur->ext_status)) {
1077 err("bus mode mismatch occurred. please check " 1075 err("bus mode mismatch occurred. please check current bus mode and card capability\n");
1078 "current bus mode and card capability\n");
1079 print_card_capability(slot_cur); 1076 print_card_capability(slot_cur);
1080 } 1077 }
1081 ibmphp_update_slot_info(slot_cur); 1078 ibmphp_update_slot_info(slot_cur);
@@ -1098,8 +1095,7 @@ static int enable_slot(struct hotplug_slot *hs)
1098 goto error_power; 1095 goto error_power;
1099 } 1096 }
1100 if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) { 1097 if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) {
1101 err("bus speed mismatch occurred. please check current bus " 1098 err("bus speed mismatch occurred. please check current bus speed and card capability\n");
1102 "speed and card capability\n");
1103 print_card_capability(slot_cur); 1099 print_card_capability(slot_cur);
1104 goto error_power; 1100 goto error_power;
1105 } 1101 }