xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: pciehp: Drop enable/disable lock

Browse Source 
Previously slot enablement and disablement could happen concurrently.
But now it's under the exclusive control of the IRQ thread, rendering
the locking obsolete.  Drop it.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Lukas Wunner
2018-07-19 17:27:46 -05:00
committed by Bjorn Helgaas
parent 32a8cef274
commit 1656716d45
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pci/hotplug/pciehp_ctrl.c
View File

@@ -277,9 +277,6 @@ void pciehp_handle_presence_change(struct slot *slot)
}
}
/*
* Note: This function must be called with slot->hotplug_lock held
*/
static int __pciehp_enable_slot(struct slot *p_slot)
{
u8 getstatus = 0;
@@ -316,10 +313,7 @@ int pciehp_enable_slot(struct slot *slot)
struct controller *ctrl = slot->ctrl;
int ret;
mutex_lock(&slot->hotplug_lock);
ret = __pciehp_enable_slot(slot);
mutex_unlock(&slot->hotplug_lock);
if (ret && ATTN_BUTTN(ctrl))
pciehp_green_led_off(slot); /* may be blinking */
@@ -330,9 +324,6 @@ int pciehp_enable_slot(struct slot *slot)
return ret;
}
/*
* Note: This function must be called with slot->hotplug_lock held
*/
static int __pciehp_disable_slot(struct slot *p_slot)
{
u8 getstatus = 0;
@@ -355,9 +346,7 @@ int pciehp_disable_slot(struct slot *slot)
{
int ret;
mutex_lock(&slot->hotplug_lock);
ret = __pciehp_disable_slot(slot);
mutex_unlock(&slot->hotplug_lock);
mutex_lock(&slot->lock);
slot->state = OFF_STATE;