PCI: pciehp: Don't re-read Slot Status when handling surprise event

Previously we read Slot Status when handling a surprise event.  But Slot
Status might have changed since we identified the event, and the event_type
already tells us whether to enable or disable the slot, so there's no need
to read it again.

Remove handle_surprise_event() and queue the power work directly.

[bhelgaas: changelog]
Tested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Mayurkumar Patel <mayurkumar.patel@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Rajat Jain <rajatxjain@gmail.com>

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 7ea3e61ea745c3bae44efbd6ceb34f6863427520..a7876842d5c1746ef9f42bda9ac56ddd1b6c5954 100644 (file)
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -299,20 +299,6 @@ static void handle_button_press_event(struct slot *p_slot)
        }
 }
 
-/*
- * Note: This function must be called with slot->lock held
- */
-static void handle_surprise_event(struct slot *p_slot)
-{
-       u8 getstatus;
-
-       pciehp_get_adapter_status(p_slot, &getstatus);
-       if (!getstatus)
-               pciehp_queue_power_work(p_slot, DISABLE_REQ);
-       else
-               pciehp_queue_power_work(p_slot, ENABLE_REQ);
-}
-
 /*
  * Note: This function must be called with slot->lock held
  */
@@ -378,14 +364,14 @@ static void interrupt_event_handler(struct work_struct *work)
                pciehp_green_led_off(p_slot);
                break;
        case INT_PRESENCE_ON:
-               handle_surprise_event(p_slot);
+               pciehp_queue_power_work(p_slot, ENABLE_REQ);
                break;
        case INT_PRESENCE_OFF:
                /*
                 * Regardless of surprise capability, we need to
                 * definitely remove a card that has been pulled out!
                 */
-               handle_surprise_event(p_slot);
+               pciehp_queue_power_work(p_slot, DISABLE_REQ);
                break;
        case INT_LINK_UP:
        case INT_LINK_DOWN: