PCI: pciehp: Move Attention & Power Indicator support tests to accessors

[~andy/linux] / drivers / pci / hotplug / pciehp_ctrl.c

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 6c730b161b33c98737ca7ba7e16009b259e70123..50628487597deb2fe9de2b7499bc7dc253c7c388 100644 (file)
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -168,11 +168,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
                msleep(1000);
        }
 
-       if (PWR_LED(ctrl))
-               pciehp_green_led_off(pslot);
-
-       if (ATTN_LED(ctrl))
-               pciehp_set_attention_status(pslot, 1);
+       pciehp_green_led_off(pslot);
+       pciehp_set_attention_status(pslot, 1);
 }
 
 /**
@@ -195,8 +192,7 @@ static int board_added(struct slot *p_slot)
                        return retval;
        }
 
-       if (PWR_LED(ctrl))
-               pciehp_green_led_blink(p_slot);
+       pciehp_green_led_blink(p_slot);
 
        /* Check link training status */
        retval = pciehp_check_link_status(ctrl);
@@ -219,9 +215,7 @@ static int board_added(struct slot *p_slot)
                goto err_exit;
        }
 
-       if (PWR_LED(ctrl))
-               pciehp_green_led_on(p_slot);
-
+       pciehp_green_led_on(p_slot);
        return 0;
 
 err_exit:
@@ -254,9 +248,7 @@ static int remove_board(struct slot *p_slot)
        }
 
        /* turn off Green LED */
-       if (PWR_LED(ctrl))
-               pciehp_green_led_off(p_slot);
-
+       pciehp_green_led_off(p_slot);
        return 0;
 }
 
@@ -292,7 +284,7 @@ static void pciehp_power_thread(struct work_struct *work)
                break;
        case POWERON_STATE:
                mutex_unlock(&p_slot->lock);
-               if (pciehp_enable_slot(p_slot) && PWR_LED(p_slot->ctrl))
+               if (pciehp_enable_slot(p_slot))
                        pciehp_green_led_off(p_slot);
                mutex_lock(&p_slot->lock);
                p_slot->state = STATIC_STATE;
@@ -359,11 +351,8 @@ static void handle_button_press_event(struct slot *p_slot)
                                  "press.\n", slot_name(p_slot));
                }
                /* blink green LED and turn off amber */
-               if (PWR_LED(ctrl))
-                       pciehp_green_led_blink(p_slot);
-               if (ATTN_LED(ctrl))
-                       pciehp_set_attention_status(p_slot, 0);
-
+               pciehp_green_led_blink(p_slot);
+               pciehp_set_attention_status(p_slot, 0);
                queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ);
                break;
        case BLINKINGOFF_STATE:
@@ -376,14 +365,11 @@ static void handle_button_press_event(struct slot *p_slot)
                ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot));
                cancel_delayed_work(&p_slot->work);
                if (p_slot->state == BLINKINGOFF_STATE) {
-                       if (PWR_LED(ctrl))
-                               pciehp_green_led_on(p_slot);
+                       pciehp_green_led_on(p_slot);
                } else {
-                       if (PWR_LED(ctrl))
-                               pciehp_green_led_off(p_slot);
+                       pciehp_green_led_off(p_slot);
                }
-               if (ATTN_LED(ctrl))
-                       pciehp_set_attention_status(p_slot, 0);
+               pciehp_set_attention_status(p_slot, 0);
                ctrl_info(ctrl, "PCI slot #%s - action canceled "
                          "due to button press\n", slot_name(p_slot));
                p_slot->state = STATIC_STATE;
@@ -443,10 +429,8 @@ static void interrupt_event_handler(struct work_struct *work)
        case INT_POWER_FAULT:
                if (!POWER_CTRL(ctrl))
                        break;
-               if (ATTN_LED(ctrl))
-                       pciehp_set_attention_status(p_slot, 1);
-               if (PWR_LED(ctrl))
-                       pciehp_green_led_off(p_slot);
+               pciehp_set_attention_status(p_slot, 1);
+               pciehp_green_led_off(p_slot);
                break;
        case INT_PRESENCE_ON:
        case INT_PRESENCE_OFF: