ACPI / dock: Drop redundant acpi_disabled check
authorHanjun Guo <hanjun.guo@linaro.org>
Thu, 5 Dec 2013 16:03:40 +0000 (00:03 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Dec 2013 00:36:32 +0000 (01:36 +0100)
commit4ef54410ca6e7e5f32d67c5fb8094ae07460814a
tree1b1e42cd65fc5db43ad77db66aaf35342c4161b0
parent95df812dbdc350bfcf31e247e9100c378a472480
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>
drivers/acpi/dock.c