瀏覽代碼

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>
Hanjun Guo 11 年之前
父節點
當前提交
4ef54410ca
共有 1 個文件被更改,包括 0 次插入3 次删除
  1. 0 3
      drivers/acpi/dock.c

+ 0 - 3
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)
 void __init acpi_dock_init(void)
 {
 {
-	if (acpi_disabled)
-		return;
-
 	/* look for dock stations and bays */
 	/* look for dock stations and bays */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 		ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);
 		ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL);