[lunar][SRU][PATCH] Revert "PCI: hv: Use async probing to reduce boot time"

[Ioanna Alifieraki]

BugLink: https://bugs.launchpad.net/bugs/2042568

This reverts commit 8bb7b605405db1cd47811ad65d2e737904a6f9ac.

Signed-off-by: Ioanna Alifieraki <ioanna-maria.alifieraki at canonical.com>
---
 drivers/pci/controller/pci-hyperv.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index e74d0a5430b7..9ab332d02a63 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -2405,16 +2405,12 @@ static int create_root_hv_pci_bus(struct hv_pcibus_device *hbus)
 	if (error)
 		return error;
 
-	/*
-	 * pci_lock_rescan_remove() and pci_unlock_rescan_remove() are
-	 * unnecessary here, because we hold the hbus->state_lock, meaning
-	 * hv_eject_device_work() and pci_devices_present_work() can't race
-	 * with create_root_hv_pci_bus().
-	 */
+	pci_lock_rescan_remove();
 	hv_pci_assign_numa_node(hbus);
 	pci_bus_assign_resources(bridge->bus);
 	hv_pci_assign_slots(hbus);
 	pci_bus_add_devices(bridge->bus);
+	pci_unlock_rescan_remove();
 	hbus->state = hv_pcibus_installed;
 	return 0;
 }
@@ -4086,9 +4082,6 @@ static struct hv_driver hv_pci_drv = {
 	.remove		= hv_pci_remove,
 	.suspend	= hv_pci_suspend,
 	.resume		= hv_pci_resume,
-	.driver = {
-		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
-	},
 };
 
 static void __exit exit_hv_pci_drv(void)
-- 
2.34.1