From patchwork Mon Sep 12 14:11:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 9326585 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 9103F6089F for ; Mon, 12 Sep 2016 14:11:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 830231FF13 for ; Mon, 12 Sep 2016 14:11:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7735C28D37; Mon, 12 Sep 2016 14:11:25 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 DE3E228D50 for ; Mon, 12 Sep 2016 14:11:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759345AbcILOLW (ORCPT ); Mon, 12 Sep 2016 10:11:22 -0400 Received: from s3.sipsolutions.net ([5.9.151.49]:58597 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758049AbcILOLU (ORCPT ); Mon, 12 Sep 2016 10:11:20 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1bjRwz-0006NJ-PQ; Mon, 12 Sep 2016 16:11:10 +0200 From: Benjamin Berg To: "Valo, Kalle" Cc: "ath10k @ lists . infradead . org" , Simon Wunderlich , "Thiagarajan, Vasanthakumar" , Sebastian Gottschall , michal.kazior@tieto.com, Mathias Kretschmer , linux-wireless@vger.kernel.org, Benjamin Berg Subject: [PATCH] ath10k: Add missing CONFIG_ATH10K_DEBUGFS check Date: Mon, 12 Sep 2016 16:11:05 +0200 Message-Id: <20160912141105.24085-1-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <871t0tp1ad.fsf@kamboji.qca.qualcomm.com> References: <871t0tp1ad.fsf@kamboji.qca.qualcomm.com> 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 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 --- 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)