From patchwork Tue Mar 24 22:49:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14134 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2OMoZlq007965 for ; Tue, 24 Mar 2009 22:50:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541AbZCXWtl (ORCPT ); Tue, 24 Mar 2009 18:49:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754944AbZCXWtk (ORCPT ); Tue, 24 Mar 2009 18:49:40 -0400 Received: from g1t0028.austin.hp.com ([15.216.28.35]:35546 "EHLO g1t0028.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541AbZCXWtk (ORCPT ); Tue, 24 Mar 2009 18:49:40 -0400 Received: from smtp1.fc.hp.com (smtp.cnd.hp.com [15.15.136.127]) by g1t0028.austin.hp.com (Postfix) with ESMTP id E0E991C1E6; Tue, 24 Mar 2009 22:49:38 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id D467F24BF97; Tue, 24 Mar 2009 22:20:40 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 870FA2614B; Tue, 24 Mar 2009 16:49:38 -0600 (MDT) From: Bjorn Helgaas Subject: [PATCH 01/10] ACPI: skip DMI power state check when ACPI disabled To: Len Brown Cc: linux-acpi@vger.kernel.org, Li Shaohua , Alexey Starikovskiy , Li Shaohua , Zhao Yakui Date: Tue, 24 Mar 2009 16:49:38 -0600 Message-ID: <20090324224938.1262.97300.stgit@bob.kio> In-Reply-To: <20090324224834.1262.65260.stgit@bob.kio> References: <20090324224834.1262.65260.stgit@bob.kio> User-Agent: StGIT/0.14.3.215.gff3d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org This patch makes acpi_init() exit early when ACPI is disabled. This skips a DMI check that affects ACPI power management. The DMI check prints a notice that is misleading when ACPI is disabled. Signed-off-by: Bjorn Helgaas --- drivers/acpi/bus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 2e90410..bdeed39 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -869,6 +869,10 @@ static int __init acpi_init(void) } } else disable_acpi(); + + if (acpi_disabled) + return result; + /* * If the laptop falls into the DMI check table, the power state check * will be disabled in the course of device power transistion.