From patchwork Mon Jan 25 09:24:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 75029 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 o0P9PDjI027595 for ; Mon, 25 Jan 2010 09:25:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753004Ab0AYJZO (ORCPT ); Mon, 25 Jan 2010 04:25:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753048Ab0AYJZN (ORCPT ); Mon, 25 Jan 2010 04:25:13 -0500 Received: from mga02.intel.com ([134.134.136.20]:64011 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004Ab0AYJZM (ORCPT ); Mon, 25 Jan 2010 04:25:12 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 25 Jan 2010 01:24:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,338,1262592000"; d="scan'208";a="486694122" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.83]) by orsmga002.jf.intel.com with ESMTP; 25 Jan 2010 01:25:02 -0800 From: yakui.zhao@intel.com To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, minyard@acm.org, openipmi-developer@lists.sourceforge.net, Zhao Yakui , Bjorn Helgaas Subject: [PATCH v5 1/2] IPMI/ACPI: use ACPI detection mechanism firstly to detect IPMI system interface Date: Mon, 25 Jan 2010 17:24:32 +0800 Message-Id: <1264411473-11273-2-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1264411473-11273-1-git-send-email-yakui.zhao@intel.com> References: <1264411473-11273-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..65dabd8 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3197,6 +3197,10 @@ static __devinit int init_ipmi_si(void) hardcode_find_bmc(); +#ifdef CONFIG_ACPI + pnp_register_driver(&ipmi_pnp_driver); +#endif + #ifdef CONFIG_DMI dmi_find_bmc(); #endif @@ -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