From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga11.intel.com ([192.55.52.93]:53494 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446AbYLSCpm (ORCPT ); Thu, 18 Dec 2008 21:45:42 -0500 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, "Kolekar, Abhijeet" , Zhu Yi Subject: [PATCH 39/43] iwl3945: add set_pwr_src Date: Fri, 19 Dec 2008 10:37:39 +0800 Message-Id: <1229654263-21454-40-git-send-email-yi.zhu@intel.com> (sfid-20081219_034633_483724_E15E70B4) In-Reply-To: <1229654263-21454-39-git-send-email-yi.zhu@intel.com> References: <1229654263-21454-1-git-send-email-yi.zhu@intel.com> <1229654263-21454-2-git-send-email-yi.zhu@intel.com> <1229654263-21454-3-git-send-email-yi.zhu@intel.com> <1229654263-21454-4-git-send-email-yi.zhu@intel.com> <1229654263-21454-5-git-send-email-yi.zhu@intel.com> <1229654263-21454-6-git-send-email-yi.zhu@intel.com> <1229654263-21454-7-git-send-email-yi.zhu@intel.com> <1229654263-21454-8-git-send-email-yi.zhu@intel.com> <1229654263-21454-9-git-send-email-yi.zhu@intel.com> <1229654263-21454-10-git-send-email-yi.zhu@intel.com> <1229654263-21454-11-git-send-email-yi.zhu@intel.com> <1229654263-21454-12-git-send-email-yi.zhu@intel.com> <1229654263-21454-13-git-send-email-yi.zhu@intel.com> <1229654263-21454-14-git-send-email-yi.zhu@intel.com> <1229654263-21454-15-git-send-email-yi.zhu@intel.com> <1229654263-21454-16-git-send-email-yi.zhu@intel.com> <1229654263-21454-17-git-send-email-yi.zhu@intel.com> <1229654263-21454-18-git-send-email-yi.zhu@intel.com> <1229654263-21454-19-git-send-email-yi.zhu@intel.com> <1229654263-21454-20-git-send-email-yi.zhu@intel.com> <1229654263-21454-21-git-send-email-yi.zhu@intel.com> <1229654263-21454-22-git-send-email-yi.zhu@intel.com> <1229654263-21454-23-git-send-email-yi.zhu@intel.com> <1229654263-21454-24-git-send-email-yi.zhu@intel.com> <1229654263-21454-25-git-send-email-yi.zhu@intel.com> <1229654263-21454-26-git-send-email-yi.zhu@intel.com> <1229654263-21454-27-git-send-email-yi.zhu@intel.com> <1229654263-21454-28-git-send-email-yi.zhu@intel.com> <1229654263-21454-29-git-send-email-yi.zhu@intel.com> <1229654263-21454-30-git-send-email-yi.zhu@intel.com> <1229654263-21454-31-git-send-email-yi.zhu@intel.com> <1229654263-21454-32-git-send-email-yi.zhu@intel.com> <1229654263-21454-33-git-send-email-yi.zhu@intel.com> <1229654263-21454-34-git-send-email-yi.zhu@intel.com> <1229654263-21454-35-git-send-email-yi.zhu@intel.com> <1229654263-21454-36-git-send-email-yi.zhu@intel.com> <1229654263-21454-37-git-send-email-yi.zhu@intel.com> <1229654263-21454-38-git-send-email-yi.zhu@intel.com> <1229654263-21454-39-git-send-email-yi.zhu@intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Kolekar, Abhijeet The patch adds 3945 iwl_lib_ops->set_pwr_src to the driver Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi --- drivers/net/wireless/iwlwifi/iwl-3945.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 3ea36f3..31ba6a5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -920,7 +920,7 @@ u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate, u8 flags) return sta_id; } -static int iwl3945_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max) +static int iwl3945_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src) { int rc; unsigned long flags; @@ -932,7 +932,7 @@ static int iwl3945_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max) return rc; } - if (!pwr_max) { + if (src == IWL_PWR_SRC_VAUX) { u32 val; rc = pci_read_config_dword(priv->pci_dev, @@ -1196,7 +1196,10 @@ int iwl3945_hw_nic_init(struct iwl_priv *priv) return rc; IWL_DEBUG_INFO("HW Revision ID = 0x%X\n", rev_id); - iwl3945_nic_set_pwr_src(priv, 1); + rc = priv->cfg->ops->lib->apm_ops.set_pwr_src(priv, IWL_PWR_SRC_VMAIN); + if(rc) + return rc; + priv->cfg->ops->lib->apm_ops.config(priv); /* Allocate the RX queue, or reset if it is already allocated */ @@ -2695,6 +2698,7 @@ static struct iwl_lib_ops iwl3945_lib = { .reset = iwl3945_apm_reset, .stop = iwl3945_apm_stop, .config = iwl3945_nic_config, + .set_pwr_src = iwl3945_set_pwr_src, }, }; -- 1.5.3.6