From: Benjamin Berg <benjamin@sipsolutions.net>
To: "Valo, Kalle" <kvalo@qca.qualcomm.com>
Cc: "ath10k @ lists . infradead . org" <ath10k@lists.infradead.org>,
Simon Wunderlich <sw@simonwunderlich.de>,
"Thiagarajan, Vasanthakumar" <vthiagar@qti.qualcomm.com>,
Sebastian Gottschall <s.gottschall@dd-wrt.com>,
michal.kazior@tieto.com,
Mathias Kretschmer <mathias.kretschmer@fit.fraunhofer.de>,
linux-wireless@vger.kernel.org,
Benjamin Berg <benjamin@sipsolutions.net>
Subject: [PATCH] ath10k: Add missing CONFIG_ATH10K_DEBUGFS check
Date: Mon, 12 Sep 2016 16:11:05 +0200 [thread overview]
Message-ID: <20160912141105.24085-1-benjamin@sipsolutions.net> (raw)
In-Reply-To: <871t0tp1ad.fsf@kamboji.qca.qualcomm.com>
The patch "ath10k: allow setting coverage class" was missing a check for
CONFIG_ATH10K_DEBUGFS so it would try to use non-existing struct elements
in some configurations. Fix this by adding the appropriate ifdef.
Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
---
Sorry, so turns out the kbuild test robot is correct and I forgot the ifdef
to check for CONFIG_ATH10K_DEBUGFS, so here a fixup commit for it.
Other than that everything looks good to me in the pending branch.
Benjamin
drivers/net/wireless/ath/ath10k/hw.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index c52b5f4..e182f09 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -338,8 +338,13 @@ static void ath10k_hw_qca988x_set_coverage_class(struct ath10k *ar,
* set the registers again if the firmware does an internal reset and
* this way we will be notified of the event.
*/
+#ifdef CONFIG_ATH10K_DEBUGFS
fw_dbglog_mask = ar->debug.fw_dbglog_mask;
fw_dbglog_level = ar->debug.fw_dbglog_level;
+#else
+ fw_dbglog_mask = 0;
+ fw_dbglog_level = 0;
+#endif
if (value > 0) {
if (fw_dbglog_level > ATH10K_DBGLOG_LEVEL_WARN)
--
2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Berg <benjamin@sipsolutions.net>
To: "Valo, Kalle" <kvalo@qca.qualcomm.com>
Cc: Simon Wunderlich <sw@simonwunderlich.de>,
"Thiagarajan, Vasanthakumar" <vthiagar@qti.qualcomm.com>,
Benjamin Berg <benjamin@sipsolutions.net>,
linux-wireless@vger.kernel.org,
Sebastian Gottschall <s.gottschall@dd-wrt.com>,
"ath10k @ lists . infradead . org" <ath10k@lists.infradead.org>,
michal.kazior@tieto.com,
Mathias Kretschmer <mathias.kretschmer@fit.fraunhofer.de>
Subject: [PATCH] ath10k: Add missing CONFIG_ATH10K_DEBUGFS check
Date: Mon, 12 Sep 2016 16:11:05 +0200 [thread overview]
Message-ID: <20160912141105.24085-1-benjamin@sipsolutions.net> (raw)
In-Reply-To: <871t0tp1ad.fsf@kamboji.qca.qualcomm.com>
The patch "ath10k: allow setting coverage class" was missing a check for
CONFIG_ATH10K_DEBUGFS so it would try to use non-existing struct elements
in some configurations. Fix this by adding the appropriate ifdef.
Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
---
Sorry, so turns out the kbuild test robot is correct and I forgot the ifdef
to check for CONFIG_ATH10K_DEBUGFS, so here a fixup commit for it.
Other than that everything looks good to me in the pending branch.
Benjamin
drivers/net/wireless/ath/ath10k/hw.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index c52b5f4..e182f09 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -338,8 +338,13 @@ static void ath10k_hw_qca988x_set_coverage_class(struct ath10k *ar,
* set the registers again if the firmware does an internal reset and
* this way we will be notified of the event.
*/
+#ifdef CONFIG_ATH10K_DEBUGFS
fw_dbglog_mask = ar->debug.fw_dbglog_mask;
fw_dbglog_level = ar->debug.fw_dbglog_level;
+#else
+ fw_dbglog_mask = 0;
+ fw_dbglog_level = 0;
+#endif
if (value > 0) {
if (fw_dbglog_level > ATH10K_DBGLOG_LEVEL_WARN)
--
2.9.3
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2016-09-12 14:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 14:45 [PATCHv3 0/5] ath10k: Allow setting coverage class and rx cleanups Benjamin Berg
2016-08-29 14:45 ` [PATCHv3 1/5] ath10k: Move ath10k_hw_params definition to hw.h Benjamin Berg
2016-09-13 12:32 ` [PATCHv3,1/5] " Kalle Valo
2016-08-29 14:45 ` [PATCHv3 2/5] ath10k: Add provision for Rx descriptor abstraction Benjamin Berg
2016-08-29 14:45 ` [PATCHv3 3/5] ath10k: Properly remove padding from the start of rx payload Benjamin Berg
2016-08-29 14:45 ` [PATCHv3 4/5] ath10k: Remove 4-addr padding related hw_param configuration Benjamin Berg
2016-08-29 14:45 ` [PATCHv3 5/5] ath10k: Allow setting coverage class Benjamin Berg
2016-09-13 12:14 ` Valo, Kalle
2016-09-14 16:32 ` [PATCH] ath10k: Fix spinlock use in coverage class hack Benjamin Berg
2016-09-14 16:32 ` Benjamin Berg
2016-09-30 12:58 ` Valo, Kalle
2016-09-30 12:58 ` Valo, Kalle
2016-10-04 15:04 ` [PATCHv3,5/5] ath10k: Allow setting coverage class Kalle Valo
2016-09-09 14:59 ` [PATCHv3 0/5] ath10k: Allow setting coverage class and rx cleanups Valo, Kalle
2016-09-09 14:59 ` Valo, Kalle
2016-09-12 14:11 ` Benjamin Berg [this message]
2016-09-12 14:11 ` [PATCH] ath10k: Add missing CONFIG_ATH10K_DEBUGFS check Benjamin Berg
2016-09-14 12:29 ` Valo, Kalle
2016-09-14 12:29 ` Valo, Kalle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160912141105.24085-1-benjamin@sipsolutions.net \
--to=benjamin@sipsolutions.net \
--cc=ath10k@lists.infradead.org \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=mathias.kretschmer@fit.fraunhofer.de \
--cc=michal.kazior@tieto.com \
--cc=s.gottschall@dd-wrt.com \
--cc=sw@simonwunderlich.de \
--cc=vthiagar@qti.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.