From patchwork Thu Apr 17 13:27:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 4008261 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 3AD219F336 for ; Thu, 17 Apr 2014 13:28:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D09E201B9 for ; Thu, 17 Apr 2014 13:28:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B84222018E for ; Thu, 17 Apr 2014 13:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932081AbaDQN2F (ORCPT ); Thu, 17 Apr 2014 09:28:05 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:56691 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756333AbaDQN2D (ORCPT ); Thu, 17 Apr 2014 09:28:03 -0400 Received: by mail-pb0-f54.google.com with SMTP id ma3so382313pbc.27 for ; Thu, 17 Apr 2014 06:28:02 -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=sypD8Gtj5mL0s0DtrwZaqMDYuX6pGdz/Kpg5hxyZ/Cc=; b=yBgVrrNZyfjin38gkFS8HAci5p83js+nGZYlAxN2p8ZBguK4TeDKtx0JyXZy4CjKqI RT2QJ4C04vqYpCzi3BKIhEb1gmNK0sd4csOjYykNe7f+YEqQAgzNLkBCW1y6yvr45Epn cC7uTjm5KhXxtWoHN675Ee8wfqRbmKt+C2lybB6wmjG+/0yaz2A94bONFJbbLl4WeoZT ybOk/yJbjLA1LjBjdZnrgzZk7fhFEMNDnGuzexeswDDspS1FxlGcp8d+ByWAVXk95UEm DLA5KF2JhmMlMn7YfmlK5wumtnPhSetUc07kBn6rMpULiP+TUEzpjZuj60iy+O5lUwER 3gNQ== X-Received: by 10.66.231.40 with SMTP id td8mr15522770pac.103.1397741282742; Thu, 17 Apr 2014 06:28:02 -0700 (PDT) Received: from localhost.localdomain ([175.153.40.25]) by mx.google.com with ESMTPSA id ir10sm53596895pbc.59.2014.04.17.06.27.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Apr 2014 06:28:02 -0700 (PDT) From: "Zhao, Gang" To: Cc: "John W. Linville" , Johannes Berg Subject: [PATCH 5/6] mac80211: replace wiphy_debug() with wiphy_dbg() Date: Thu, 17 Apr 2014 21:27:13 +0800 Message-Id: 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: Johannes Berg Signed-off-by: Zhao, Gang --- net/mac80211/cfg.c | 6 +++--- net/mac80211/main.c | 8 ++++---- net/mac80211/mlme.c | 10 +++++----- net/mac80211/rate.c | 4 ++-- net/mac80211/rx.c | 6 +++--- net/mac80211/tx.c | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index aaa59d7..4ac047e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2097,9 +2097,9 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy, sdata->tx_conf[params->ac] = p; if (drv_conf_tx(local, sdata, params->ac, &p)) { - wiphy_debug(local->hw.wiphy, - "failed to set TX queue parameters for AC %d\n", - params->ac); + wiphy_dbg(local->hw.wiphy, + "failed to set TX queue parameters for AC %d\n", + params->ac); return -EINVAL; } diff --git a/net/mac80211/main.c b/net/mac80211/main.c index b055f6a5..aed2f5d 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -993,8 +993,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) result = ieee80211_wep_init(local); if (result < 0) - wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n", - result); + wiphy_dbg(local->hw.wiphy, "Failed to initialize wep: %d\n", + result); local->hw.conf.flags = IEEE80211_CONF_IDLE; @@ -1005,8 +1005,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) result = ieee80211_init_rate_ctrl_alg(local, hw->rate_control_algorithm); if (result < 0) { - wiphy_debug(local->hw.wiphy, - "Failed to initialize rate control algorithm\n"); + wiphy_dbg(local->hw.wiphy, + "Failed to initialize rate control algorithm\n"); goto fail_rate; } diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index dee50ae..1e1bdd2 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3523,11 +3523,11 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) * We actually lost the connection ... or did we? * Let's make sure! */ - wiphy_debug(local->hw.wiphy, - "%s: No probe response from AP %pM" - " after %dms, disconnecting.\n", - sdata->name, - bssid, probe_wait_ms); + wiphy_dbg(local->hw.wiphy, + "%s: No probe response from AP %pM" + " after %dms, disconnecting.\n", + sdata->name, + bssid, probe_wait_ms); ieee80211_sta_connection_lost(sdata, bssid, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false); diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 8fdadfd..b91be51 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -739,8 +739,8 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, WARN_ON(local->rate_ctrl); local->rate_ctrl = ref; - wiphy_debug(local->hw.wiphy, "Selected rate control algorithm '%s'\n", - ref->ops->name); + wiphy_dbg(local->hw.wiphy, "Selected rate control algorithm '%s'\n", + ref->ops->name); return 0; } diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 216c45b..c86a4d6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3176,9 +3176,9 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx, skb = skb_copy(skb, GFP_ATOMIC); if (!skb) { if (net_ratelimit()) - wiphy_debug(local->hw.wiphy, - "failed to copy skb for %s\n", - sdata->name); + wiphy_dbg(local->hw.wiphy, + "failed to copy skb for %s\n", + sdata->name); return true; } diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 19d36d4..48650da 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1483,8 +1483,8 @@ static int ieee80211_skb_resize(struct ieee80211_sub_if_data *sdata, return 0; if (pskb_expand_head(skb, head_need, tail_need, GFP_ATOMIC)) { - wiphy_debug(local->hw.wiphy, - "failed to reallocate TX buffer\n"); + wiphy_dbg(local->hw.wiphy, + "failed to reallocate TX buffer\n"); return -ENOMEM; }