From patchwork Fri May 18 01:20:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Phillips X-Patchwork-Id: 10408007 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 9747960247 for ; Fri, 18 May 2018 01:23:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8528D2851A for ; Fri, 18 May 2018 01:23:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7982428581; Fri, 18 May 2018 01:23:12 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3C5F2851A for ; Fri, 18 May 2018 01:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yMf0iNaRNPRIXD5KI24Cl3zm/rkCi5wHcug9lFHTGcY=; b=dBuMXmuFMKgNkSEy6A69h343mx SlP/WhLBtOCBhQx7tqyg76Rg6bVppfKZONVrLNqMcgKbzc1ncqSXMsgOlnT8kHCsdTmz/+pxri/Ks UQBO9dimg2I2ZP7yAtgQMch1R1z/Y5p2cLetYw4zhSrgbY6UkrpL3x9pqLaesube0xomqVX7c0zSU u1FUJ9TufIb2c0ZE65iUSF79kHlSzOpv0coVk3gbV0sFqxaj6d2h2w1UGOyUr88kk+CmhqI9Hk12W HtLObiX5fxkqgtb1ULPCWqIt0cYA6O+y+lq1VAr0q9cEQkaKKtbOOGZoJ9f69GO6ZfH1IH2uKYJGO ofQfEJWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJU6m-0003Nv-Um; Fri, 18 May 2018 01:23:01 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJU57-0002fV-M7 for linux-arm-kernel@lists.infradead.org; Fri, 18 May 2018 01:21:35 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DDDAD15AB; Thu, 17 May 2018 18:21:06 -0700 (PDT) Received: from localhost.localdomain (unknown [10.118.17.245]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D8E553F25D; Thu, 17 May 2018 18:21:05 -0700 (PDT) From: Kim Phillips To: Greg Kroah-Hartman , Mathieu Poirier Subject: [PATCH 3/6] coresight: use IS_ENABLED for CONFIGs that may be modules Date: Thu, 17 May 2018 20:20:21 -0500 Message-Id: <20180518012024.22645-3-kim.phillips@arm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518012024.22645-1-kim.phillips@arm.com> References: <20180517070643.GC13919@kroah.com> <20180518012024.22645-1-kim.phillips@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180517_182117_735549_BDA4346B X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kefeng Wang , Kim Phillips , Geert Uytterhoeven , Alexander Shishkin , Oleg Nesterov , David Howells , Russell King , Pavel Tatashin , Thierry Reding , Rik van Riel , Eric Auger , Alex Williamson , Kirill Tkhai , Gargi Sharma , linux-arm-kernel@lists.infradead.org, Randy Dunlap , linux-kernel@vger.kernel.org, Mike Rapoport , Eric Biederman , Andrew Morton , Robin Murphy , Todd Kjos MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Checking for CONFIG_x fails if CONFIG_x=m, use IS_ENABLED that is true for built-ins and modules instead. Required when building various coresight components as modules. Signed-off-by: Kim Phillips --- drivers/hwtracing/coresight/coresight-etm-perf.h | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 2 +- include/linux/coresight.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h index 4197df4faf5e..539b250df455 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -43,7 +43,7 @@ struct etm_filters { }; -#ifdef CONFIG_CORESIGHT +#if IS_ENABLED(CONFIG_CORESIGHT) int etm_perf_symlink(struct coresight_device *csdev, bool link); #else diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 0e5a74dae6a6..83a6f5b7a683 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -136,7 +136,7 @@ struct list_head *coresight_build_path(struct coresight_device *csdev, struct coresight_device *sink); void coresight_release_path(struct list_head *path); -#ifdef CONFIG_CORESIGHT_SOURCE_ETM3X +#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) extern int etm_readl_cp14(u32 off, unsigned int *val); extern int etm_writel_cp14(u32 off, u32 val); #else diff --git a/include/linux/coresight.h b/include/linux/coresight.h index e5421b83e4e6..548fa56b29bd 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -236,7 +236,7 @@ struct coresight_ops { const struct coresight_ops_source *source_ops; }; -#ifdef CONFIG_CORESIGHT +#if IS_ENABLED(CONFIG_CORESIGHT) extern struct coresight_device * coresight_register(struct coresight_desc *desc); extern void coresight_unregister(struct coresight_device *csdev);