From patchwork Sat Mar 13 18:13:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Myron Stowe X-Patchwork-Id: 85755 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2DIDg8o027563 for ; Sat, 13 Mar 2010 18:13:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934057Ab0CMSNq (ORCPT ); Sat, 13 Mar 2010 13:13:46 -0500 Received: from g1t0028.austin.hp.com ([15.216.28.35]:43745 "EHLO g1t0028.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932953Ab0CMSNn (ORCPT ); Sat, 13 Mar 2010 13:13:43 -0500 Received: from g1t0039.austin.hp.com (g1t0039.austin.hp.com [16.236.32.45]) by g1t0028.austin.hp.com (Postfix) with ESMTP id CA1381C408; Sat, 13 Mar 2010 18:13:42 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g1t0039.austin.hp.com (Postfix) with ESMTP id A99FE34D08; Sat, 13 Mar 2010 18:13:42 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 9035CCF0011; Sat, 13 Mar 2010 11:13:42 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6NynDB98EebD; Sat, 13 Mar 2010 11:13:42 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 7AA4ECF000F; Sat, 13 Mar 2010 11:13:42 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 5AD91261FA; Sat, 13 Mar 2010 11:13:42 -0700 (MST) Subject: [PATCH v2 1/3] ipmi: Raise precedence of PNP based discovery mechanisms (ACPI, PCI) To: minyard@acm.org From: Myron Stowe Cc: linux-acpi@vger.kernel.org, openipmi-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, lenb@kernel.org Date: Sat, 13 Mar 2010 11:13:42 -0700 Message-ID: <20100313181342.20614.72981.stgit@bob.kio> In-Reply-To: <20100313180121.20614.92547.stgit@bob.kio> References: <20100313180121.20614.92547.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 13 Mar 2010 18:13:58 +0000 (UTC) diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 176f175..86a7dd7 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3197,13 +3197,6 @@ static __devinit int init_ipmi_si(void) hardcode_find_bmc(); -#ifdef CONFIG_DMI - dmi_find_bmc(); -#endif - -#ifdef CONFIG_ACPI - spmi_find_bmc(); -#endif #ifdef CONFIG_ACPI pnp_register_driver(&ipmi_pnp_driver); #endif @@ -3220,6 +3213,14 @@ static __devinit int init_ipmi_si(void) of_register_platform_driver(&ipmi_of_platform_driver); #endif +#ifdef CONFIG_DMI + dmi_find_bmc(); +#endif + +#ifdef CONFIG_ACPI + spmi_find_bmc(); +#endif + if (si_trydefaults) { mutex_lock(&smi_infos_lock); if (list_empty(&smi_infos)) {