From patchwork Thu Apr 17 13:27:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 4008251 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 35EF99F336 for ; Thu, 17 Apr 2014 13:28:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AC2E201B9 for ; Thu, 17 Apr 2014 13:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C42A2018E for ; Thu, 17 Apr 2014 13:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756618AbaDQN17 (ORCPT ); Thu, 17 Apr 2014 09:27:59 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:50318 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756333AbaDQN16 (ORCPT ); Thu, 17 Apr 2014 09:27:58 -0400 Received: by mail-pa0-f50.google.com with SMTP id kq14so379526pab.23 for ; Thu, 17 Apr 2014 06:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Cwspb16wujzmR7idqUnN8/qOUa7mQ04NbpBiTmWkYvQ=; b=piQieMLOA1cbiR5XmF2FD3BEeOx3QppzyOGbD2a1qTOsAWx+c/r8CGLGcWmYabWdJn dSZ/uqjzvY5tRUvwtay8hNxFOKvMwxxdsOfhbzB1uN7iNoqJ7QodePu0C3phA0TxZWG9 GIJvXI+TmQ2iSV5p3fftJYGoLJ5qlQp/rzVVn7BuPoTuzLemQ7G/m+raxQh7K4LP10d0 F0V5UnkhS/MOAFRr1odEjZtaAt+IacZrInjhffrkw6ucx1bznnOmOkqJ4uBGia5Qu83h 9HeC2OF4ifmMm8u07blrOhtguQiIZUeA6nWa1mLDT65Qu+2rmJQNGbTztrcwBH8N+joN irRQ== X-Received: by 10.68.110.226 with SMTP id id2mr15878884pbb.40.1397741277788; Thu, 17 Apr 2014 06:27:57 -0700 (PDT) Received: from localhost.localdomain ([175.153.40.25]) by mx.google.com with ESMTPSA id ir10sm53596895pbc.59.2014.04.17.06.27.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Apr 2014 06:27:57 -0700 (PDT) From: "Zhao, Gang" To: Cc: "John W. Linville" , Lennert Buytenhek Subject: [PATCH 4/6] mwl8k: replace wiphy_debug() with wiphy_dbg() Date: Thu, 17 Apr 2014 21:27:12 +0800 Message-Id: <739c076c117c39064b509d3fad4220062a8f3e1a.1397741141.git.gamerh2o@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Dynamic debug function wiphy_dbg() is more convenient for debugging, and if user doesn't enable CONFIG_DYNAMIC_DEBUG, it will fall back to normal static debug, just as what wiphy_debug() does. When all the users of wiphy_debug() are gone, wiphy_debug() can be removed. Cc: Lennert Buytenhek Signed-off-by: Zhao, Gang --- drivers/net/wireless/mwl8k.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 3c0a0a8..2e17f3d 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -1792,8 +1792,8 @@ mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid) stream->state = AMPDU_STREAM_NEW; stream->tid = tid; stream->idx = i; - wiphy_debug(hw->wiphy, "Added a new stream for %pM %d", - sta->addr, tid); + wiphy_dbg(hw->wiphy, "Added a new stream for %pM %d", + sta->addr, tid); return stream; } } @@ -1810,19 +1810,19 @@ mwl8k_start_stream(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream) return 0; ret = ieee80211_start_tx_ba_session(stream->sta, stream->tid, 0); if (ret) - wiphy_debug(hw->wiphy, "Failed to start stream for %pM %d: " - "%d\n", stream->sta->addr, stream->tid, ret); + wiphy_dbg(hw->wiphy, "Failed to start stream for %pM %d: " + "%d\n", stream->sta->addr, stream->tid, ret); else - wiphy_debug(hw->wiphy, "Started stream for %pM %d\n", - stream->sta->addr, stream->tid); + wiphy_dbg(hw->wiphy, "Started stream for %pM %d\n", + stream->sta->addr, stream->tid); return ret; } static void mwl8k_remove_stream(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream) { - wiphy_debug(hw->wiphy, "Remove stream for %pM %d\n", stream->sta->addr, - stream->tid); + wiphy_dbg(hw->wiphy, "Remove stream for %pM %d\n", stream->sta->addr, + stream->tid); memset(stream, 0, sizeof(*stream)); } @@ -2042,8 +2042,8 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, skb->len, PCI_DMA_TODEVICE); if (pci_dma_mapping_error(priv->pdev, dma)) { - wiphy_debug(hw->wiphy, - "failed to dma map skb, dropping TX frame.\n"); + wiphy_dbg(hw->wiphy, + "failed to dma map skb, dropping TX frame.\n"); if (start_ba_session) { spin_lock(&priv->stream_lock); mwl8k_remove_stream(hw, stream); @@ -4027,8 +4027,8 @@ mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream, rc = mwl8k_post_pervif_cmd(hw, vif, &cmd->header); - wiphy_debug(hw->wiphy, "Created a BA stream for %pM : tid %d\n", - stream->sta->addr, stream->tid); + wiphy_dbg(hw->wiphy, "Created a BA stream for %pM : tid %d\n", + stream->sta->addr, stream->tid); kfree(cmd); return rc; @@ -4050,7 +4050,7 @@ static void mwl8k_destroy_ba(struct ieee80211_hw *hw, cmd->destroy_params.ba_context = cpu_to_le32(idx); mwl8k_post_cmd(hw, &cmd->header); - wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", idx); + wiphy_dbg(hw->wiphy, "Deleted BA stream index %d\n", idx); kfree(cmd); } @@ -4683,8 +4683,8 @@ static void mwl8k_tx(struct ieee80211_hw *hw, int index = skb_get_queue_mapping(skb); if (!priv->radio_on) { - wiphy_debug(hw->wiphy, - "dropped TX frame since radio disabled\n"); + wiphy_dbg(hw->wiphy, + "dropped TX frame since radio disabled\n"); dev_kfree_skb(skb); return; } @@ -5470,7 +5470,7 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, stream = mwl8k_add_stream(hw, sta, tid); } if (stream == NULL) { - wiphy_debug(hw->wiphy, "no free AMPDU streams\n"); + wiphy_dbg(hw->wiphy, "no free AMPDU streams\n"); rc = -EBUSY; break; } @@ -5540,9 +5540,9 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, spin_unlock(&priv->stream_lock); mwl8k_destroy_ba(hw, idx); spin_lock(&priv->stream_lock); - wiphy_debug(hw->wiphy, - "Failed adding stream for sta %pM tid %d\n", - addr, tid); + wiphy_dbg(hw->wiphy, + "Failed adding stream for sta %pM tid %d\n", + addr, tid); mwl8k_remove_stream(hw, stream); } break;