evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wil6210: align wil log functions to wil_dbg_ratelimited implementation

Browse source 
Change the implementation of wil log functions for consistency
with __wil_dbg_ratelimited.

Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 8fe2a5f9f9b5a2f26d9d31d350b2323aee13067a
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
CRs-Fixed: 1015627
[merez@coreaurora.org: fixed merge conflicts]
Change-Id: Ie7e073d672a561b768cb62f1e39af24c1d7c3322
Signed-off-by: Maya Erez <merez@codeaurora.org>
This commit is contained in:
Maya Erez 2016-06-02 22:58:48 +03:00 • committed by Kyle Yan
parent 9137d71437
commit a55a0d7fc7
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/net/wireless/ath/wil6210/debug.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013 Qualcomm Atheros, Inc. * Copyright (c) 2013,2016 Qualcomm Atheros, Inc.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -19,34 +19,31 @@
void __wil_err(struct wil6210_priv *wil, const char *fmt, ...) void __wil_err(struct wil6210_priv *wil, const char *fmt, ...)
{ {
struct net_device *ndev = wil_to_ndev(wil); struct va_format vaf;
struct va_format vaf = {
.fmt = fmt,
};
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
netdev_err(ndev, "%pV", &vaf); netdev_err(wil_to_ndev(wil), "%pV", &vaf);
trace_wil6210_log_err(&vaf); trace_wil6210_log_err(&vaf);
va_end(args); va_end(args);
} }
void __wil_err_ratelimited(struct wil6210_priv *wil, const char *fmt, ...) void __wil_err_ratelimited(struct wil6210_priv *wil, const char *fmt, ...)
{ {
if (net_ratelimit()) { struct va_format vaf;
struct net_device *ndev = wil_to_ndev(wil);
struct va_format vaf = {
.fmt = fmt,
};
va_list args; va_list args;
if (!net_ratelimit())
return;
va_start(args, fmt); va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
netdev_err(ndev, "%pV", &vaf); netdev_err(wil_to_ndev(wil), "%pV", &vaf);
trace_wil6210_log_err(&vaf); trace_wil6210_log_err(&vaf);
va_end(args); va_end(args);
}
} }
void wil_dbg_ratelimited(const struct wil6210_priv *wil, const char *fmt, ...) void wil_dbg_ratelimited(const struct wil6210_priv *wil, const char *fmt, ...)
@ -67,27 +64,24 @@ void wil_dbg_ratelimited(const struct wil6210_priv *wil, const char *fmt, ...)
void __wil_info(struct wil6210_priv *wil, const char *fmt, ...) void __wil_info(struct wil6210_priv *wil, const char *fmt, ...)
{ {
struct net_device *ndev = wil_to_ndev(wil); struct va_format vaf;
struct va_format vaf = {
.fmt = fmt,
};
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
netdev_info(ndev, "%pV", &vaf); netdev_info(wil_to_ndev(wil), "%pV", &vaf);
trace_wil6210_log_info(&vaf); trace_wil6210_log_info(&vaf);
va_end(args); va_end(args);
} }
void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...) void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...)
{ {
struct va_format vaf = { struct va_format vaf;
.fmt = fmt,
};
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
trace_wil6210_log_dbg(&vaf); trace_wil6210_log_dbg(&vaf);
va_end(args); va_end(args);