From: Hanjun Guo <hanjun.guo@linaro.org>
Date: Thu, 5 Dec 2013 16:03:40 +0000 (+0800)
Subject: ACPI / dock: Drop redundant acpi_disabled check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4ef54410ca6e7e5f32d67c5fb8094ae07460814a;p=deliverable%2Flinux.git

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>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 9ab9e783a894..c2090c023102 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -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);