diff options
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_core.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index 4f1b0da8e47e..34de5697983d 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c | |||
@@ -416,27 +416,12 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot) | |||
416 | 416 | ||
417 | static int __init acpiphp_init(void) | 417 | static int __init acpiphp_init(void) |
418 | { | 418 | { |
419 | int retval; | ||
420 | int docking_station; | ||
421 | |||
422 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); | 419 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); |
423 | 420 | ||
424 | acpiphp_debug = debug; | 421 | acpiphp_debug = debug; |
425 | 422 | ||
426 | docking_station = find_dock_station(); | ||
427 | |||
428 | /* read all the ACPI info from the system */ | 423 | /* read all the ACPI info from the system */ |
429 | retval = init_acpi(); | 424 | return init_acpi(); |
430 | |||
431 | /* if we have found a docking station, we should | ||
432 | * go ahead and load even if init_acpi has found | ||
433 | * no slots. This handles the case when the _DCK | ||
434 | * method not defined under the actual dock bridge | ||
435 | */ | ||
436 | if (docking_station) | ||
437 | return 0; | ||
438 | else | ||
439 | return retval; | ||
440 | } | 425 | } |
441 | 426 | ||
442 | 427 | ||
@@ -444,8 +429,6 @@ static void __exit acpiphp_exit(void) | |||
444 | { | 429 | { |
445 | /* deallocate internal data structures etc. */ | 430 | /* deallocate internal data structures etc. */ |
446 | acpiphp_glue_exit(); | 431 | acpiphp_glue_exit(); |
447 | |||
448 | remove_dock_station(); | ||
449 | } | 432 | } |
450 | 433 | ||
451 | module_init(acpiphp_init); | 434 | module_init(acpiphp_init); |