From patchwork Thu Jan 19 17:25:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9526577 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 7D4FD60113 for ; Thu, 19 Jan 2017 17:55:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D890284D5 for ; Thu, 19 Jan 2017 17:55:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6204728531; Thu, 19 Jan 2017 17:55:06 +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 3331D2853E for ; Thu, 19 Jan 2017 17:55:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753652AbdASRzD (ORCPT ); Thu, 19 Jan 2017 12:55:03 -0500 Received: from mail-oi0-f67.google.com ([209.85.218.67]:33552 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754103AbdASRxY (ORCPT ); Thu, 19 Jan 2017 12:53:24 -0500 Received: by mail-oi0-f67.google.com with SMTP id j15so3775912oih.0 for ; Thu, 19 Jan 2017 09:53:24 -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=99VAxClDq0PdSFimCyYA4hjmpkgnQA8qq092rkNoljw=; b=GUszduqddZc3kookzUOVdv3KskKQhKLVIWUsOnf5+/EtBRnhQqK62Ew2QCqJj2RQJB v2+1LqGrQo/xoVkCZcnUvRA1877w18QQTme0er089E4vIFB0xeyk/lMbllknrX2G27YD xuj1Oq4b5fEWZx0Fqhsui38lBhW0UwJuBABDLq0TMPd8s9r76KY8afUNZbEC8+3BofLg hAKlFfbixuXcGRlIQfteVv4h0if5GTJ5HWCdYcGzkPwJyhVOh8Y1foMH2OmrPmFSW0PR ZJfEXlMwBR9qEY36ifnsPXh7Kmec02s3CQg0rPb40WgfQy8dfI3p/LHhmjFLGIvEYExr PTIQ== 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=99VAxClDq0PdSFimCyYA4hjmpkgnQA8qq092rkNoljw=; b=ufVPVavsFqAYihY+ZFwrAyJNh4dFh43y7yTMSXNKKkGgms5EegvJaSxHg9VMDx96Gy zpl9NhAOf08hoFjT61UkFQIovNbuRLA1k3UWMYrRB6ahevjRLWBVMEVxiFTlrVWqSpJx 2x/rtFN5fCozto4RyQg+YcIf7ildkNFK1jNcoInUJpQ9D/IVv2zaP2Z5kPCU8Tv/RgRC JP1F5R0FbXRB1UELpkv7hV16GylhtdD9VR/xXDzxqm7N2FY8dMC32f5Hti1pdDnO/MRC LyPLtGd6o6T6nIZDazZ3wXQu9Cpzij9VYFiVWu836pJfsfc3mYXuB8BcrbDHL6UkdUy3 t/sA== X-Gm-Message-State: AIkVDXLyMVs8+7y4dosYGYuoppTv1I7rzL1dTW0bkTTzEAO9/AGCnJeJKvl9Xf5ookTvSw== X-Received: by 10.202.75.78 with SMTP id y75mr3430085oia.6.1484846728563; Thu, 19 Jan 2017 09:25:28 -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 s56sm2247907otd.25.2017.01.19.09.25.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 09:25:28 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Ping-Ke Shih Subject: [PATCH v2 1/3] rtlwifi: Redo debugging macros RTPRINT and RT_PRINT_DATA Date: Thu, 19 Jan 2017 11:25:19 -0600 Message-Id: <20170119172521.32643-2-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170119172521.32643-1-Larry.Finger@lwfinger.net> References: <20170119172521.32643-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 These two debugging formss implement debugging using rather complicated macro constructions. These are replaced with compiled code that is easier to understand. Signed-off-by: Larry Finger Cc: Ping-Ke Shih --- V2 - No changes. --- drivers/net/wireless/realtek/rtlwifi/debug.c | 42 ++++++++++++++++++++++++---- drivers/net/wireless/realtek/rtlwifi/debug.h | 33 ++++++++++------------ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c index 33905bb..cd2efac 100644 --- a/drivers/net/wireless/realtek/rtlwifi/debug.c +++ b/drivers/net/wireless/realtek/rtlwifi/debug.c @@ -51,7 +51,7 @@ EXPORT_SYMBOL_GPL(rtl_dbgp_flag_init); #ifdef CONFIG_RTLWIFI_DEBUG void _rtl_dbg_trace(struct rtl_priv *rtlpriv, int comp, int level, - const char *modname, const char *fmt, ...) + const char *fmt, ...) { if (unlikely((comp & rtlpriv->dbg.global_debugcomponents) && (level <= rtlpriv->dbg.global_debuglevel))) { @@ -63,13 +63,45 @@ void _rtl_dbg_trace(struct rtl_priv *rtlpriv, int comp, int level, vaf.fmt = fmt; vaf.va = &args; - printk(KERN_DEBUG "%s:%ps:<%lx-%x> %pV", - modname, __builtin_return_address(0), - in_interrupt(), in_atomic(), - &vaf); + pr_debug(":<%lx> %pV", in_interrupt(), &vaf); va_end(args); } } EXPORT_SYMBOL_GPL(_rtl_dbg_trace); + +void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level, + const char *fmt, ...) +{ + if (unlikely((comp & rtlpriv->dbg.global_debugcomponents) && + (level <= rtlpriv->dbg.global_debuglevel))) { + struct va_format vaf; + va_list args; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + pr_debug("%pV", &vaf); + + va_end(args); + } +} +EXPORT_SYMBOL_GPL(_rtl_dbg_print); + +void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level, + const char *titlestring, + const void *hexdata, int hexdatalen) +{ + if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) && + ((level) <= rtlpriv->dbg.global_debuglevel))) { + pr_debug("In process \"%s\" (pid %i): %s\n", + current->comm, current->pid, titlestring); + print_hex_dump_bytes("", DUMP_PREFIX_NONE, + hexdata, hexdatalen); + } +} +EXPORT_SYMBOL_GPL(_rtl_dbg_print_data); + #endif diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.h b/drivers/net/wireless/realtek/rtlwifi/debug.h index a6cc3ca..90c670b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/debug.h +++ b/drivers/net/wireless/realtek/rtlwifi/debug.h @@ -168,34 +168,29 @@ enum dbgp_flag_e { struct rtl_priv; -__printf(5, 6) +__printf(4, 5) void _rtl_dbg_trace(struct rtl_priv *rtlpriv, int comp, int level, - const char *modname, const char *fmt, ...); + const char *fmt, ...); + +__printf(4, 5) +void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level, + const char *fmt, ...); + +void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level, + const char *titlestring, + const void *hexdata, int hexdatalen); #define RT_TRACE(rtlpriv, comp, level, fmt, ...) \ _rtl_dbg_trace(rtlpriv, comp, level, \ - KBUILD_MODNAME, fmt, ##__VA_ARGS__) + fmt, ##__VA_ARGS__) #define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...) \ -do { \ - if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) { \ - printk(KERN_DEBUG KBUILD_MODNAME ": " fmt, \ - ##__VA_ARGS__); \ - } \ -} while (0) + _rtl_dbg_print(rtlpriv, dbgtype, dbgflag, fmt, ##__VA_ARGS__) #define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata, \ _hexdatalen) \ -do { \ - if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) && \ - (_level <= rtlpriv->dbg.global_debuglevel))) { \ - printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n", \ - KBUILD_MODNAME, current->comm, current->pid, \ - _titlestring); \ - print_hex_dump_bytes("", DUMP_PREFIX_NONE, \ - _hexdata, _hexdatalen); \ - } \ -} while (0) + _rtl_dbg_print_data(rtlpriv, _comp, _level, \ + _titlestring, _hexdata, _hexdatalen) #else