Commit 4ef54410 authored Dec 06, 2013 by Hanjun Guo Committed by Rafael J. Wysocki Dec 07, 2013

ACPI / dock: Drop redundant acpi_disabled check



acpi_dock_init() is only called from acpi_scan_init() and the
code logic shows that it doesn't need to check acpi_disabled:

acpi_init();
	if (acpi_disabled) return;
	acpi_scan_init();
		acpi_dock_init();
			if (acpi_disabled) /* redundant */
				return;

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 95df812d

drivers/acpi/dock.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -896,9 +896,6 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void context, void *rv)

		void __init acpi_dock_init(void)
		{
		if (acpi_disabled)
		return;

		/* look for dock stations and bays */
		acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
		ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);