From patchwork Wed Dec 16 14:40:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 68376 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI4ixoU005715 for ; Fri, 18 Dec 2009 04:46:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762169AbZLPOmX (ORCPT ); Wed, 16 Dec 2009 09:42:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762187AbZLPOmW (ORCPT ); Wed, 16 Dec 2009 09:42:22 -0500 Received: from mga01.intel.com ([192.55.52.88]:3431 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762169AbZLPOmT (ORCPT ); Wed, 16 Dec 2009 09:42:19 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 16 Dec 2009 06:35:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,406,1257148800"; d="scan'208";a="756730136" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.17]) by fmsmga001.fm.intel.com with ESMTP; 16 Dec 2009 06:42:13 -0800 From: yakui.zhao@intel.com To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, minyard@acm.org, openipmi-developer@sourceforege.net, Zhao Yakui , Bjorn Helgaas Subject: [PATCH 2/3] ipmi/acpi: use ACPI detection mechanism firstly to detect IPMI system interface Date: Wed, 16 Dec 2009 22:40:30 +0800 Message-Id: <1260974431-4330-2-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1260974431-4330-1-git-send-email-yakui.zhao@intel.com> References: <1260974431-4330-1-git-send-email-yakui.zhao@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 679cd08..99fecd2 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3195,6 +3195,10 @@ static __devinit int init_ipmi_si(void) printk(KERN_INFO "IPMI System Interface driver.\n"); +#ifdef CONFIG_PNP + pnp_register_driver(&ipmi_pnp_driver); +#endif + hardcode_find_bmc(); #ifdef CONFIG_DMI @@ -3204,9 +3208,6 @@ static __devinit int init_ipmi_si(void) #ifdef CONFIG_ACPI spmi_find_bmc(); #endif -#ifdef CONFIG_PNP - pnp_register_driver(&ipmi_pnp_driver); -#endif #ifdef CONFIG_PCI rv = pci_register_driver(&ipmi_pci_driver);