Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 14de9f46972ee798926e9a1805c356fc02bb291e..826560753389ca3f1d2dd1bc2670f15f059970ae 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -1064,10 +1064,10 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
        return AE_OK;
 }
 
-int __init acpi_dock_init(void)
+void __init acpi_dock_init(void)
 {
        if (acpi_disabled)
-               return 0;
+               return;
 
        /* look for dock stations and bays */
        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
@@ -1075,11 +1075,10 @@ int __init acpi_dock_init(void)
 
        if (!dock_station_count) {
                pr_info(PREFIX "No dock devices found.\n");
-               return 0;
+               return;
        }
 
        register_acpi_bus_notifier(&dock_acpi_notifier);
        pr_info(PREFIX "%s: %d docks/bays found\n",
                ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count);
-       return 0;
 }