From patchwork Mon Sep 28 16:34:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11804065 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 852F26CB for ; Mon, 28 Sep 2020 16:36:11 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C8982080C for ; Mon, 28 Sep 2020 16:36:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TYMc/sAX"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AlPBzp9R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C8982080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=+gWJfHIGPAIRRn/RL+5fq75aNg4QJKNqio/9a3PnE2g=; b=TYMc/sAXQNv7thrp+zxugdwwd +Kp35EstfbWCKOKfr9QDUk9lZbPHkJZis2fmnqEubkwuB8Q8FMH3CsGU7B1r+9qUq0xt2He8t3AOl dRknrdBd40aT9VgLtDdusJ37aZ2SDZXYcHkVEkRUmPNgZyCFRyhIfTqHyHGuptdu7oyyU/qbYapdA HmT3l8ubNUDHFLATOOxWsojoMbPGbnvbGbv3cqGSxVwfisO6K9PCI60uyehW8GsqH2+wytmFe52q2 ratb+MBx9b8CVyMxqJHSqpB/yEFFTOSHRepg+h93tgEF/YM7GJo3C3SuNQ1PnQFoF0Mr2sxem3dD5 /03YnDlDA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw85-0000nZ-SX; Mon, 28 Sep 2020 16:35:57 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw7T-0000Vw-QX for linux-arm-kernel@lists.infradead.org; Mon, 28 Sep 2020 16:35:24 +0000 Received: by mail-pf1-x42a.google.com with SMTP id f18so1501926pfa.10 for ; Mon, 28 Sep 2020 09:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9uBCtknHRVZ5YnORcKUKYFX5Ylh+EACLqKEbj0M9418=; b=AlPBzp9R1iGsWkWvsea30Ky4Jf59IpYlVNEppTSV6TglRjfCq5a7ee/tdFR+FATgSC /UahVo/hAwOOuBnVwCX7/4N1czOyehEX71/q8UC5X527oiXyG1QwlmH1u9PKJ+46yFp0 Szb7ViFF0+Jo+82wfVFuaiypgv6HQYG0wHb/MhwNr8WslXoEMpfw4tmFpKWNyqk0LVEn O7+lGP8G+eHtd9gepldPpDT/FzhO/B9a7uGgHziEdjMbmhAF98h5lUbct1a6f7oeA6QF svhwaD1f0uxniFxcY8PpyXpkMTP9UFBt5cjruXn3ktU4KD4+O+OQYszVB8D1bXAHDsrp cb3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9uBCtknHRVZ5YnORcKUKYFX5Ylh+EACLqKEbj0M9418=; b=UfWIoCevJB4Dig9Z2QtifTEdYA7wSSRYs316zh2g3k9PxqNi+NfZAR9TQR1cI3Yt8l kCd72GB/F3LcsVM5I9ZdETJviEPOecmt13Z6HCWlGRvxKtFQFQ1JXNup4ld+s+NGq+Ei oIXBlsWk64qgLvTdGvY6fcAQ0lNWn4cfTMMiHuIu/wjdH0ZkVjHP5THGBcJJ6PJoFKuy IWvTu2F1nIiJo5br+jkIfgNM7iU5uDRIRB85/SDYLgmZJhDK/GvUT/OnK+3QO5I882gx hnR2IWDciHZ8Akpd121KreGa4de8dBv1TqXVt9UQ+38Ul7DLVGuUVvh46EycQpEaQpUX ndlw== X-Gm-Message-State: AOAM533joIKkPDv1x4WUCySt71uX8huZ736zEkySBkYV2O5N3rvi45fT AyPaaPU0t3U/DFmu+foW9PRPR5ftiwGwRg== X-Google-Smtp-Source: ABdhPJz6aKTIfIyMjaMa3S62Vjbum7V1Km03/87+OVuGz5uTmbrdR9pwN1RYvGZ0BVneyop2M5lliA== X-Received: by 2002:a63:f104:: with SMTP id f4mr1834586pgi.365.1601310917763; Mon, 28 Sep 2020 09:35:17 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f19sm2345640pfd.45.2020.09.28.09.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 09:35:17 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 03/25] coresight: Use IS_ENABLED for CONFIGs that may be modules Date: Mon, 28 Sep 2020 10:34:51 -0600 Message-Id: <20200928163513.70169-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org> References: <20200928163513.70169-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200928_123519_889660_AF20D019 X-CRM114-Status: GOOD ( 14.89 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:42a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Kim Phillips Checking for ifdef CONFIG_x fails if CONFIG_x=m. Use IS_ENABLED that is true for both built-ins and modules, instead. Required when building coresight components as modules. Cc: Mathieu Poirier Cc: Leo Yan Cc: Alexander Shishkin Cc: Randy Dunlap Cc: Suzuki K Poulose Cc: Greg Kroah-Hartman Cc: Russell King Signed-off-by: Kim Phillips Signed-off-by: Tingwei Zhang Reviewed-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- 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 015213abe00a..05f89723e282 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -57,7 +57,7 @@ struct etm_event_data { struct list_head * __percpu *path; }; -#ifdef CONFIG_CORESIGHT +#if IS_ENABLED(CONFIG_CORESIGHT) int etm_perf_symlink(struct coresight_device *csdev, bool link); int etm_perf_add_symlink_sink(struct coresight_device *csdev); void etm_perf_del_symlink_sink(struct coresight_device *csdev); diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 5fe773c4d6cc..28695e26e5c6 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -166,7 +166,7 @@ int coresight_make_links(struct coresight_device *orig, void coresight_remove_links(struct coresight_device *orig, struct coresight_connection *conn); -#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 58fffdecdbfd..3bb738f9a326 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -324,7 +324,7 @@ struct coresight_ops { const struct coresight_ops_ect *ect_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);