From patchwork Thu Mar 4 03:44:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Myron Stowe X-Patchwork-Id: 83506 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 o243iE2H015794 for ; Thu, 4 Mar 2010 03:44:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754767Ab0CDDoP (ORCPT ); Wed, 3 Mar 2010 22:44:15 -0500 Received: from g6t0184.atlanta.hp.com ([15.193.32.61]:40841 "EHLO g6t0184.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754728Ab0CDDoL (ORCPT ); Wed, 3 Mar 2010 22:44:11 -0500 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g6t0184.atlanta.hp.com (Postfix) with ESMTP id 9BFEACB72; Thu, 4 Mar 2010 03:44:10 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 7B61E14113; Thu, 4 Mar 2010 03:44:10 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 4364BCF0036; Wed, 3 Mar 2010 20:44:10 -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 nhzOC0UuDoTT; Wed, 3 Mar 2010 20:44:10 -0700 (MST) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 2EF2FCF0032; Wed, 3 Mar 2010 20:44:10 -0700 (MST) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 2E7ED2617B; Wed, 3 Mar 2010 20:44:10 -0700 (MST) Subject: [PATCH 1/4] 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, lenb@kernel.org Date: Wed, 03 Mar 2010 20:44:10 -0700 Message-ID: <20100304034410.30205.13074.stgit@bob.kio> In-Reply-To: <20100304033146.30205.68689.stgit@bob.kio> References: <20100304033146.30205.68689.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]); Thu, 04 Mar 2010 03:44:16 +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)) {