From patchwork Mon Jun 7 09:27:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 104662 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 o579UBdK027139 for ; Mon, 7 Jun 2010 09:30:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674Ab0FGJaM (ORCPT ); Mon, 7 Jun 2010 05:30:12 -0400 Received: from mga03.intel.com ([143.182.124.21]:55740 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752939Ab0FGJaL (ORCPT ); Mon, 7 Jun 2010 05:30:11 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 07 Jun 2010 02:30:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,377,1272870000"; d="scan'208";a="285843190" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.23]) by azsmga001.ch.intel.com with ESMTP; 07 Jun 2010 02:30:09 -0700 From: yakui.zhao@intel.com To: minyard@acm.org Cc: lenb@kernel.org, openipmi-developer@lists.sourceforge.net, linux-acpi@vger.kernel.org, Zhao Yakui , Bjorn Helgaas , Myron Stowe Subject: [PATCH -v6 2/2] IPMI: use ACPI detection mechanism firstly to detect IPMI system interface Date: Mon, 7 Jun 2010 17:27:22 +0800 Message-Id: <1275902842-19895-3-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1275902842-19895-2-git-send-email-yakui.zhao@intel.com> References: <1275902842-19895-1-git-send-email-yakui.zhao@intel.com> <1275902842-19895-2-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 07 Jun 2010 09:30:15 +0000 (UTC) diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 87b5722..2807749 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3763,16 +3763,16 @@ static __devinit int init_ipmi_si(void) } mutex_unlock(&smi_infos_lock); +#ifdef CONFIG_ACPI + pnp_register_driver(&ipmi_pnp_driver); +#endif + #ifdef CONFIG_PCI rv = pci_register_driver(&ipmi_pci_driver); if (rv) printk(KERN_ERR PFX "Unable to register PCI driver: %d\n", rv); #endif -#ifdef CONFIG_ACPI - pnp_register_driver(&ipmi_pnp_driver); -#endif - #ifdef CONFIG_DMI dmi_find_bmc(); #endif @@ -3933,6 +3933,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