diff options
Diffstat (limited to 'drivers/pci/hotplug/pciehp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 98e541ffef3d..c8cb49c5a752 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
@@ -173,7 +173,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl) | |||
173 | return 1; | 173 | return 1; |
174 | } | 174 | } |
175 | 175 | ||
176 | /* The following routines constitute the bulk of the | 176 | /* The following routines constitute the bulk of the |
177 | hotplug controller logic | 177 | hotplug controller logic |
178 | */ | 178 | */ |
179 | 179 | ||
@@ -181,7 +181,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) | |||
181 | { | 181 | { |
182 | /* turn off slot, turn on Amber LED, turn off Green LED if supported*/ | 182 | /* turn off slot, turn on Amber LED, turn off Green LED if supported*/ |
183 | if (POWER_CTRL(ctrl->ctrlcap)) { | 183 | if (POWER_CTRL(ctrl->ctrlcap)) { |
184 | if (pslot->hpc_ops->power_off_slot(pslot)) { | 184 | if (pslot->hpc_ops->power_off_slot(pslot)) { |
185 | err("%s: Issue of Slot Power Off command failed\n", | 185 | err("%s: Issue of Slot Power Off command failed\n", |
186 | __FUNCTION__); | 186 | __FUNCTION__); |
187 | return; | 187 | return; |
@@ -189,7 +189,7 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) | |||
189 | } | 189 | } |
190 | 190 | ||
191 | if (PWR_LED(ctrl->ctrlcap)) | 191 | if (PWR_LED(ctrl->ctrlcap)) |
192 | pslot->hpc_ops->green_led_off(pslot); | 192 | pslot->hpc_ops->green_led_off(pslot); |
193 | 193 | ||
194 | if (ATTN_LED(ctrl->ctrlcap)) { | 194 | if (ATTN_LED(ctrl->ctrlcap)) { |
195 | if (pslot->hpc_ops->set_attention_status(pslot, 1)) { | 195 | if (pslot->hpc_ops->set_attention_status(pslot, 1)) { |
@@ -231,7 +231,7 @@ static int board_added(struct slot *p_slot) | |||
231 | if (retval) | 231 | if (retval) |
232 | return retval; | 232 | return retval; |
233 | } | 233 | } |
234 | 234 | ||
235 | if (PWR_LED(ctrl->ctrlcap)) | 235 | if (PWR_LED(ctrl->ctrlcap)) |
236 | p_slot->hpc_ops->green_led_blink(p_slot); | 236 | p_slot->hpc_ops->green_led_blink(p_slot); |
237 | 237 | ||
@@ -548,7 +548,7 @@ int pciehp_enable_slot(struct slot *p_slot) | |||
548 | mutex_unlock(&p_slot->ctrl->crit_sect); | 548 | mutex_unlock(&p_slot->ctrl->crit_sect); |
549 | return -ENODEV; | 549 | return -ENODEV; |
550 | } | 550 | } |
551 | if (MRL_SENS(p_slot->ctrl->ctrlcap)) { | 551 | if (MRL_SENS(p_slot->ctrl->ctrlcap)) { |
552 | rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); | 552 | rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); |
553 | if (rc || getstatus) { | 553 | if (rc || getstatus) { |
554 | info("%s: latch open on slot(%s)\n", __FUNCTION__, | 554 | info("%s: latch open on slot(%s)\n", __FUNCTION__, |
@@ -557,8 +557,8 @@ int pciehp_enable_slot(struct slot *p_slot) | |||
557 | return -ENODEV; | 557 | return -ENODEV; |
558 | } | 558 | } |
559 | } | 559 | } |
560 | 560 | ||
561 | if (POWER_CTRL(p_slot->ctrl->ctrlcap)) { | 561 | if (POWER_CTRL(p_slot->ctrl->ctrlcap)) { |
562 | rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); | 562 | rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); |
563 | if (rc || getstatus) { | 563 | if (rc || getstatus) { |
564 | info("%s: already enabled on slot(%s)\n", __FUNCTION__, | 564 | info("%s: already enabled on slot(%s)\n", __FUNCTION__, |
@@ -593,7 +593,7 @@ int pciehp_disable_slot(struct slot *p_slot) | |||
593 | /* Check to see if (latch closed, card present, power on) */ | 593 | /* Check to see if (latch closed, card present, power on) */ |
594 | mutex_lock(&p_slot->ctrl->crit_sect); | 594 | mutex_lock(&p_slot->ctrl->crit_sect); |
595 | 595 | ||
596 | if (!HP_SUPR_RM(p_slot->ctrl->ctrlcap)) { | 596 | if (!HP_SUPR_RM(p_slot->ctrl->ctrlcap)) { |
597 | ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus); | 597 | ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus); |
598 | if (ret || !getstatus) { | 598 | if (ret || !getstatus) { |
599 | info("%s: no adapter on slot(%s)\n", __FUNCTION__, | 599 | info("%s: no adapter on slot(%s)\n", __FUNCTION__, |
@@ -603,7 +603,7 @@ int pciehp_disable_slot(struct slot *p_slot) | |||
603 | } | 603 | } |
604 | } | 604 | } |
605 | 605 | ||
606 | if (MRL_SENS(p_slot->ctrl->ctrlcap)) { | 606 | if (MRL_SENS(p_slot->ctrl->ctrlcap)) { |
607 | ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); | 607 | ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); |
608 | if (ret || getstatus) { | 608 | if (ret || getstatus) { |
609 | info("%s: latch open on slot(%s)\n", __FUNCTION__, | 609 | info("%s: latch open on slot(%s)\n", __FUNCTION__, |
@@ -613,7 +613,7 @@ int pciehp_disable_slot(struct slot *p_slot) | |||
613 | } | 613 | } |
614 | } | 614 | } |
615 | 615 | ||
616 | if (POWER_CTRL(p_slot->ctrl->ctrlcap)) { | 616 | if (POWER_CTRL(p_slot->ctrl->ctrlcap)) { |
617 | ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); | 617 | ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus); |
618 | if (ret || !getstatus) { | 618 | if (ret || !getstatus) { |
619 | info("%s: already disabled slot(%s)\n", __FUNCTION__, | 619 | info("%s: already disabled slot(%s)\n", __FUNCTION__, |