pciehp: cleanup wait command completion

This patch cleans up the code to wait for command completion.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index e2d45662bdbf..f7b8e0504fec 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -374,25 +374,13 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                 pciehp_ctrl_list = ctrl;
         }
 
-        /* Wait for exclusive access to hardware */
-        mutex_lock(&ctrl->ctrl_lock);
-
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-        
         if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
                 rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
-                if (rc) {
-                        /* Done with exclusive hardware access */
-                        mutex_unlock(&ctrl->ctrl_lock);
+                if (rc)
                         goto err_out_free_ctrl_slot;
-                } else
-                        /* Wait for the command to complete */
-                        wait_for_ctrl_irq (ctrl);
         }
 
-        /* Done with exclusive hardware access */
-        mutex_unlock(&ctrl->ctrl_lock);
-
         return 0;
 
 err_out_free_ctrl_slot: