From patchwork Tue Dec 29 01:44:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 70072 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 nBT1kUE1024127 for ; Tue, 29 Dec 2009 01:46:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751547AbZL2Bq3 (ORCPT ); Mon, 28 Dec 2009 20:46:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751947AbZL2Bq3 (ORCPT ); Mon, 28 Dec 2009 20:46:29 -0500 Received: from mga09.intel.com ([134.134.136.24]:43903 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbZL2Bq2 (ORCPT ); Mon, 28 Dec 2009 20:46:28 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 28 Dec 2009 17:46:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,465,1257148800"; d="scan'208";a="582696521" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.10]) by orsmga001.jf.intel.com with ESMTP; 28 Dec 2009 17:45:57 -0800 From: yakui.zhao@intel.com To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, minyard@acm.org, openipmi-developer@lists.sourceforge.net, bjorn.helgaas@hp.com, Zhao Yakui Subject: [PATCH v4 1/2] IPMI/ACPI: use ACPI detection mechanism firstly to detect IPMI system interface Date: Tue, 29 Dec 2009 09:44:19 +0800 Message-Id: <1262051060-23245-2-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1262051060-23245-1-git-send-email-yakui.zhao@intel.com> References: <1262051060-23245-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 176f175..3f6ca11 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_ACPI + 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_ACPI - pnp_register_driver(&ipmi_pnp_driver); -#endif #ifdef CONFIG_PCI rv = pci_register_driver(&ipmi_pci_driver); @@ -3330,6 +3331,7 @@ static __exit void cleanup_ipmi_si(void) #ifdef CONFIG_PCI pci_unregister_driver(&ipmi_pci_driver); #endif + #ifdef CONFIG_ACPI pnp_unregister_driver(&ipmi_pnp_driver); #endif