summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-04 13:25:04 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-04 13:25:04 +0200
commit2ce65fe89153b6091393541de7e211d505436ff7 (patch)
tree9e9b23cb922ed8f9b1d4b345cd373f0715e6031a /drivers/acpi
parent91bdad0b6237c25a7bf8fd4604d0cc64a2005a23 (diff)
downloadop-kernel-dev-2ce65fe89153b6091393541de7e211d505436ff7.zip
op-kernel-dev-2ce65fe89153b6091393541de7e211d505436ff7.tar.gz
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/dock.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 14de9f4..8265607 100644
--- 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;
}
OpenPOWER on IntegriCloud