File tree Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Original file line number Diff line number Diff line change @@ -46,8 +46,6 @@ struct vmbus_dynid {
46
46
47
47
static struct acpi_device * hv_acpi_dev ;
48
48
49
- static struct completion probe_event ;
50
-
51
49
static int hyperv_cpuhp_online ;
52
50
53
51
static void * hv_panic_page ;
@@ -2467,7 +2465,6 @@ static int vmbus_acpi_add(struct acpi_device *device)
2467
2465
ret_val = 0 ;
2468
2466
2469
2467
acpi_walk_err :
2470
- complete (& probe_event );
2471
2468
if (ret_val )
2472
2469
vmbus_acpi_remove (device );
2473
2470
return ret_val ;
@@ -2646,6 +2643,7 @@ static struct acpi_driver vmbus_acpi_driver = {
2646
2643
.remove = vmbus_acpi_remove ,
2647
2644
},
2648
2645
.drv .pm = & vmbus_bus_pm ,
2646
+ .drv .probe_type = PROBE_FORCE_SYNCHRONOUS ,
2649
2647
};
2650
2648
2651
2649
static void hv_kexec_handler (void )
@@ -2718,16 +2716,14 @@ static struct syscore_ops hv_synic_syscore_ops = {
2718
2716
2719
2717
static int __init hv_acpi_init (void )
2720
2718
{
2721
- int ret , t ;
2719
+ int ret ;
2722
2720
2723
2721
if (!hv_is_hyperv_initialized ())
2724
2722
return - ENODEV ;
2725
2723
2726
2724
if (hv_root_partition )
2727
2725
return 0 ;
2728
2726
2729
- init_completion (& probe_event );
2730
-
2731
2727
/*
2732
2728
* Get ACPI resources first.
2733
2729
*/
@@ -2736,9 +2732,8 @@ static int __init hv_acpi_init(void)
2736
2732
if (ret )
2737
2733
return ret ;
2738
2734
2739
- t = wait_for_completion_timeout (& probe_event , 5 * HZ );
2740
- if (t == 0 ) {
2741
- ret = - ETIMEDOUT ;
2735
+ if (!hv_acpi_dev ) {
2736
+ ret = - ENODEV ;
2742
2737
goto cleanup ;
2743
2738
}
2744
2739
You can’t perform that action at this time.
0 commit comments