From patchwork Fri Feb 3 17:35:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9554757 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 92022604A7 for ; Fri, 3 Feb 2017 17:35:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8773E283F7 for ; Fri, 3 Feb 2017 17:35:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AD1E2847A; Fri, 3 Feb 2017 17:35:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEF11283F7 for ; Fri, 3 Feb 2017 17:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbdBCRfm (ORCPT ); Fri, 3 Feb 2017 12:35:42 -0500 Received: from mail-oi0-f68.google.com ([209.85.218.68]:33946 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbdBCRfk (ORCPT ); Fri, 3 Feb 2017 12:35:40 -0500 Received: by mail-oi0-f68.google.com with SMTP id w144so1914600oiw.1 for ; Fri, 03 Feb 2017 09:35:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mOpgiNUieHVcHUGeFYeg3zzhz2rzX0gUC/wv8wXLgC0=; b=HH42W3R9pkosFeNr3b0UgujAAG9E4Ow0nt2HE57Al4LWbTWPxtYOpPIVpvcwHaXay8 gxqPgjnwewvNygLZ/qK4hKOlUMjFwF6NTUWyexgEuMjD1GIcOlNbMGmGVoc7b8XGWMqT aZh/TJmzVkslHplVO2tGhk0tdeZPyeMte+gZoxVgJ1Pd8G6t82meRofpdDNKIT/wOj79 ZGuC1lKQzmFAmTpid2XPt5Q37SZ6Iqh6lTwe3cCHOjA5m15QjoFrFo6rpzSFofnqxC79 KuVbATT8/RLMuVqKdA7tywovUZBxtEGqDLBWiNrl8w7Jx2e8CO53XdkYQmR03FajQVaH mFKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mOpgiNUieHVcHUGeFYeg3zzhz2rzX0gUC/wv8wXLgC0=; b=rIT5kM87iKDzhSJZWUEmaK6tYyVsUpKeNCyJhVW2dH6zHnFbj4P0gVR25KZIBf4P+2 dEJk+41nvHCYSzDVXMO5xI2ipaMWjm+7LuVJeVkc/Hulsq7CzvAHQvcTzznNc3GenXvj 1vuwMBLj5cQypvP5iND2Zey1wwlRKrur1wGlI+6QaQL5JE3e5BdrQ97/WoYVsSOaRhV6 viyOFDIcatUlcjEjq9y5/kIlueJE6L3GvmxPB31hdWH+n9ILzfsduxedWPqFyBBMdkqm YlubT+NIM4mhyMEPlt4CASrHVBv3ZIVymu/YJHJHs92fGbzcUbgRfTf+KqVYg4vWdUI+ 9jvw== X-Gm-Message-State: AIkVDXLQNUIYBQumuOfC2OjShsO8kwRCEAHyAgdsvdYExropvaf3Pz6GYLoQr2E21JNKEQ== X-Received: by 10.202.231.77 with SMTP id e74mr6709459oih.85.1486143340160; Fri, 03 Feb 2017 09:35:40 -0800 (PST) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id r84sm14381064oie.24.2017.02.03.09.35.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Feb 2017 09:35:39 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Ping-Ke Shih Subject: [PATCH v2 7/7] rtlwifi: btcoexist: Convert halbtcoutsrc.c to use standard debugging Date: Fri, 3 Feb 2017 11:35:21 -0600 Message-Id: <20170203173521.6635-8-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170203173521.6635-1-Larry.Finger@lwfinger.net> References: <20170203173521.6635-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The routines in btcoexist use different debugging routines than are used in the other drivers. This patch converts halbtcoutsrc.c to use the standard routines. It also deletes the definitions of the now-unused debugging macros, and turns on compilation of all the routines in btcoexist. Signed-off-by: Larry Finger Cc: Ping-Ke Shih --- v2 - No change --- drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile | 7 +++++-- .../net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 4 ++-- .../net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 12 ------------ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile index 0ef0d31..20582df 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile @@ -1,5 +1,8 @@ -btcoexist-objs := halbtc8723b2ant.o \ - halbtc8192e2ant.o \ +btcoexist-objs := halbtc8192e2ant.o \ + halbtc8723b1ant.o \ + halbtc8723b2ant.o \ + halbtc8821a1ant.o \ + halbtc8821a2ant.o \ halbtcoutsrc.o \ rtl_btc.o diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 9a89ae0..150aeb8 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -141,8 +141,8 @@ static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist) if (rtlphy->current_channel != 0) chnl = rtlphy->current_channel; - btc_alg_dbg(ALGO_TRACE, - "static halbtc_get_wifi_central_chnl:%d\n", chnl); + RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, + "static halbtc_get_wifi_central_chnl:%d\n", chnl); return chnl; } diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h index f9e7c5e..601bbe1 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h @@ -116,18 +116,6 @@ extern u32 btc_dbg_type[]; #define WIFI_P2P_GO_CONNECTED BIT3 #define WIFI_P2P_GC_CONNECTED BIT4 -#define btc_alg_dbg(dbgflag, fmt, ...) \ -do { \ - if (unlikely(btc_dbg_type[BTC_MSG_ALGORITHM] & dbgflag)) \ - printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ -} while (0) -#define btc_iface_dbg(dbgflag, fmt, ...) \ -do { \ - if (unlikely(btc_dbg_type[BTC_MSG_INTERFACE] & dbgflag)) \ - printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ -} while (0) - - #define BTC_RSSI_HIGH(_rssi_) \ ((_rssi_ == BTC_RSSI_STATE_HIGH || \ _rssi_ == BTC_RSSI_STATE_STAY_HIGH) ? true : false)