Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69bd3c5b authored by Mayurkumar Patel's avatar Mayurkumar Patel Committed by Bjorn Helgaas
Browse files

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: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarMayurkumar Patel <mayurkumar.patel@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarRajat Jain <rajatxjain@gmail.com>
parent 0c923d1d

drivers/pci/hotplug/pciehp_ctrl.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -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

 * 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);

		pciehp_green_led_off(p_slot);

		break;

		break;

	case INT_PRESENCE_ON:

	case INT_PRESENCE_ON:

		handle_surprise_event(p_slot);

		pciehp_queue_power_work(p_slot, ENABLE_REQ);

		break;

		break;

	case INT_PRESENCE_OFF:

	case INT_PRESENCE_OFF:

		/*

		/*

		 * Regardless of surprise capability, we need to

		 * Regardless of surprise capability, we need to

		 * definitely remove a card that has been pulled out!

		 * definitely remove a card that has been pulled out!

		 */

		 */

		handle_surprise_event(p_slot);

		pciehp_queue_power_work(p_slot, DISABLE_REQ);

		break;

		break;

	case INT_LINK_UP:

	case INT_LINK_UP:

	case INT_LINK_DOWN:

	case INT_LINK_DOWN: