diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2013-12-06 00:03:40 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:36:32 +0100 |
| commit | 4ef54410ca6e7e5f32d67c5fb8094ae07460814a (patch) | |
| tree | 1b1e42cd65fc5db43ad77db66aaf35342c4161b0 /drivers/acpi | |
| parent | 95df812dbdc350bfcf31e247e9100c378a472480 (diff) | |
| download | blackbird-op-linux-4ef54410ca6e7e5f32d67c5fb8094ae07460814a.tar.gz blackbird-op-linux-4ef54410ca6e7e5f32d67c5fb8094ae07460814a.zip | |
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
1 files changed, 0 insertions, 3 deletions
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); |
