From patchwork Thu Dec 5 16:03:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 22081 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F35C7202E0 for ; Thu, 5 Dec 2013 16:04:28 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf56036071obc.3 for ; Thu, 05 Dec 2013 08:04:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sZscFFT4oVemAkXBpaIM+hzPXiclIXo99dYe3xcgJcE=; b=ChffheFxdchfFJR1Bqd/ZuPFvYDo8o3qkFGSrEoDWG1bzCdEUhevtblYAwf0PsXFga trJM5/uQfu/sTYM+QKz23dEtiTnmuUOReCW1fPIpOSkX1vubUGSyksPrMxma5nkZJtPY 9LK6f6wy1JNXDGOQ6Rm5IGS8/AStuGSLKGhKE3esk86PnSKaYb3U1N/TOQ6J/gAaXX7n 08SdEWn90IezF9pnxtUgYpneHRSdQXUGkXRNzTWxPgkI7AjZT8N+/ICmuIFC5PrTy+GY hw1QxhkYZkLmlPexIKwMp/BqBsOaFqaaV4zlR/DK4p6gT1VvCjfJfYyoAH8juRa5ThIw LEUw== X-Gm-Message-State: ALoCoQm1WSlU3rTK/jmPMcmdlzAlKwzaTjI3jxM2lttM+9GKCCMyTQzbHHyRXwgvjZcsplrWvV6y X-Received: by 10.43.152.202 with SMTP id kx10mr25602297icc.3.1386259468392; Thu, 05 Dec 2013 08:04:28 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.9 with SMTP id ga9ls875830qeb.38.gmail; Thu, 05 Dec 2013 08:04:28 -0800 (PST) X-Received: by 10.52.119.163 with SMTP id kv3mr1210698vdb.90.1386259468217; Thu, 05 Dec 2013 08:04:28 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id gs2si20371397vdc.122.2013.12.05.08.04.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Dec 2013 08:04:28 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so13771275veb.39 for ; Thu, 05 Dec 2013 08:04:28 -0800 (PST) X-Received: by 10.220.58.1 with SMTP id e1mr64933632vch.0.1386259468073; Thu, 05 Dec 2013 08:04:28 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp26552vcz; Thu, 5 Dec 2013 08:04:27 -0800 (PST) X-Received: by 10.68.244.168 with SMTP id xh8mr53227795pbc.3.1386259467302; Thu, 05 Dec 2013 08:04:27 -0800 (PST) Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by mx.google.com with ESMTPS id bc2si58329880pad.216.2013.12.05.08.04.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Dec 2013 08:04:27 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.160.45; Received: by mail-pb0-f45.google.com with SMTP id rp16so26117848pbb.18 for ; Thu, 05 Dec 2013 08:04:26 -0800 (PST) X-Received: by 10.68.251.133 with SMTP id zk5mr53413499pbc.69.1386259466775; Thu, 05 Dec 2013 08:04:26 -0800 (PST) Received: from localhost ([61.148.199.138]) by mx.google.com with ESMTPSA id ug2sm39741726pac.21.2013.12.05.08.04.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Dec 2013 08:04:26 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, Rob Herring , patches@linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH 2/2] ACPI / sleep: Remove the redundant if (acpi_disabled) check Date: Fri, 6 Dec 2013 00:03:41 +0800 Message-Id: <1386259421-10320-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386259421-10320-1-git-send-email-hanjun.guo@linaro.org> References: <1386259421-10320-1-git-send-email-hanjun.guo@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , acpi_sleep_init() will only be called in acpi_bus_init(), and the code logic shows that if (acpi_disabled) is redundant: acpi_init(); if (acpi_disabled) return; acpi_bus_init(); acpi_sleep_init(); if (acpi_disabled) return 0; Signed-off-by: Hanjun Guo --- drivers/acpi/sleep.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 208ac8c..54ab266 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -802,9 +802,6 @@ int __init acpi_sleep_init(void) char *pos = supported; int i; - if (acpi_disabled) - return 0; - acpi_sleep_dmi_check(); sleep_states[ACPI_STATE_S0] = 1;