From patchwork Thu Nov 26 12:15:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 7706321 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ADE6D9F2EC for ; Thu, 26 Nov 2015 12:16:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5B63207A1 for ; Thu, 26 Nov 2015 12:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15921207A0 for ; Thu, 26 Nov 2015 12:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752150AbbKZMQQ (ORCPT ); Thu, 26 Nov 2015 07:16:16 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:49709 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbbKZMQO (ORCPT ); Thu, 26 Nov 2015 07:16:14 -0500 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1a1vSm-000633-59; Thu, 26 Nov 2015 12:15:48 +0000 Received: from broonie by debutante with local (Exim 4.86) (envelope-from ) id 1a1vSj-0002S8-Ap; Thu, 26 Nov 2015 12:15:45 +0000 From: Mark Brown To: Kalle Valo Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, Mark Brown Date: Thu, 26 Nov 2015 12:15:35 +0000 Message-Id: <1448540135-9388-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.6.2 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Subject: [PATCH] ath10k: Fix check for !THERMAL case X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) 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 When defining stubs for !THERMAL cases we currently check if CONFIG_THERMAL is defined but this fails when the thermal code is built as a module in which case CONFIG_THERMAL_MODULE is defined instead causing us to define the stubs as well as building the actual ath10k thermal code which in turn causes the build to fail on arm64 allmodconfig. Fix this by changing the check in the header to use IS_ENABLED(). Signed-off-by: Mark Brown --- drivers/net/wireless/ath/ath10k/thermal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/thermal.h b/drivers/net/wireless/ath/ath10k/thermal.h index b610ea5caae8..793eec160e65 100644 --- a/drivers/net/wireless/ath/ath10k/thermal.h +++ b/drivers/net/wireless/ath/ath10k/thermal.h @@ -36,7 +36,7 @@ struct ath10k_thermal { int temperature; }; -#ifdef CONFIG_THERMAL +#if IS_ENABLED(CONFIG_THERMAL) int ath10k_thermal_register(struct ath10k *ar); void ath10k_thermal_unregister(struct ath10k *ar); void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);