Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI / dock: Actually define acpi_dock_init() as void

Commit 94add0f (ACPI / dock: Initialize ACPI dock subsystem upfront)
changed the header of acpi_dock_init() in internal.h so that it is
supposed to be a void function now, but it forgot to update its
actual definition in dock.c according to which it still is supposed
to return int.

Although that didn't cause any visible breakage or even a compiler
warning to be thrown, which is odd enough, fix it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 3.10+ <stable@vger.kernel.org>

+3 -4
+3 -4
drivers/acpi/dock.c
··· 1064 1064 return AE_OK; 1065 1065 } 1066 1066 1067 - int __init acpi_dock_init(void) 1067 + void __init acpi_dock_init(void) 1068 1068 { 1069 1069 if (acpi_disabled) 1070 - return 0; 1070 + return; 1071 1071 1072 1072 /* look for dock stations and bays */ 1073 1073 acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ··· 1075 1075 1076 1076 if (!dock_station_count) { 1077 1077 pr_info(PREFIX "No dock devices found.\n"); 1078 - return 0; 1078 + return; 1079 1079 } 1080 1080 1081 1081 register_acpi_bus_notifier(&dock_acpi_notifier); 1082 1082 pr_info(PREFIX "%s: %d docks/bays found\n", 1083 1083 ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count); 1084 - return 0; 1085 1084 }