From patchwork Thu Apr 8 20:58:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12192487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C9CAC433ED for ; Thu, 8 Apr 2021 20:59:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3F706120C for ; Thu, 8 Apr 2021 20:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232005AbhDHU75 (ORCPT ); Thu, 8 Apr 2021 16:59:57 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:46418 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231862AbhDHU75 (ORCPT ); Thu, 8 Apr 2021 16:59:57 -0400 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-09.nifty.com with ESMTP id 138Kx470002644; Fri, 9 Apr 2021 05:59:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 138Kx470002644 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1617915545; bh=li+MZgWK1zbowIjt4vew6oW8eQO9xUf7NDfIE5qrd/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6tCSszvXF5B4p66VXsQCP5aJi+AyC6AWK4jGea6kk9qDk0GZaiZqfo5IjJrb8kA6 INS3rY66896AlpYPyNfK7Utz082+29QzhOABzalEBnsiyqV1SjqzpIgPQPmUE733/g DSJZpI//Vy0TSTxlY0Swgzms2LEkEo3qw75xVDIPsnOrUi/lMkR8DX8kClRlHHkwSB VzbtXIVtG+hwjah7iLN0a+JaqmlqN5N8oP4TBVSbkjx+alwsVV2SB2SJY4cUswNny8 3dw4EqaZ06dQ1Ur3bi4/74FaQa9pBAHA8WF0yNe0+jmy0k9ExPyWsadNC5T5WOqFpJ VtG7bRRNu/+Qg== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-gpio@vger.kernel.org, Arnd Bergmann , Paul Cercueil , Masahiro Yamada , Linus Walleij , linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH 1/2] linux/kconfig.h: replace IF_ENABLED() with PTR_IF() in Date: Fri, 9 Apr 2021 05:58:57 +0900 Message-Id: <20210408205858.51751-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210408205858.51751-1-masahiroy@kernel.org> References: <20210408205858.51751-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org is included from all the kernel-space source files, including C, assembly, linker scripts. It is intended to contain minimal set of macros to evaluate CONFIG options. IF_ENABLED() is an intruder here because (x ? y : z) is C code, which should not be included from assembly files or linker scripts. Also, is no longer self-contained because NULL is defined in . Move IF_ENABLED() out to as PTR_IF(). PTR_IF(IS_ENABLED(CONFIG_FOO), ...) is slightly longer than IF_ENABLED(CONFIG_FOO, ...), but it is not a big deal because sub-systems often define dedicated macros such as of_match_ptr(), pm_ptr() etc. for common use-cases. Signed-off-by: Masahiro Yamada --- drivers/pinctrl/pinctrl-ingenic.c | 20 ++++++++++---------- include/linux/kconfig.h | 6 ------ include/linux/kernel.h | 2 ++ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index f2746125b077..b21e2ae4528d 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -2496,43 +2496,43 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) static const struct of_device_id ingenic_pinctrl_of_match[] = { { .compatible = "ingenic,jz4740-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4740, &jz4740_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4740), &jz4740_chip_info) }, { .compatible = "ingenic,jz4725b-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4725B, &jz4725b_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4725B), &jz4725b_chip_info) }, { .compatible = "ingenic,jz4760-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4760), &jz4760_chip_info) }, { .compatible = "ingenic,jz4760b-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4760), &jz4760_chip_info) }, { .compatible = "ingenic,jz4770-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4770, &jz4770_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4770), &jz4770_chip_info) }, { .compatible = "ingenic,jz4780-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_JZ4780, &jz4780_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_JZ4780), &jz4780_chip_info) }, { .compatible = "ingenic,x1000-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_X1000, &x1000_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_X1000), &x1000_chip_info) }, { .compatible = "ingenic,x1000e-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_X1000, &x1000_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_X1000), &x1000_chip_info) }, { .compatible = "ingenic,x1500-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_X1500, &x1500_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_X1500), &x1500_chip_info) }, { .compatible = "ingenic,x1830-pinctrl", - .data = IF_ENABLED(CONFIG_MACH_X1830, &x1830_chip_info) + .data = PTR_IF(IS_ENABLED(CONFIG_MACH_X1830), &x1830_chip_info) }, { /* sentinel */ }, }; diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index 24a59cb06963..cc8fa109cfa3 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -70,10 +70,4 @@ */ #define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option)) -/* - * IF_ENABLED(CONFIG_FOO, ptr) evaluates to (ptr) if CONFIG_FOO is set to 'y' - * or 'm', NULL otherwise. - */ -#define IF_ENABLED(option, ptr) (IS_ENABLED(option) ? (ptr) : NULL) - #endif /* __LINUX_KCONFIG_H */ diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5b7ed6dc99ac..8685ca4cf287 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -38,6 +38,8 @@ #define PTR_ALIGN_DOWN(p, a) ((typeof(p))ALIGN_DOWN((unsigned long)(p), (a))) #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +#define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL) + /* generic data direction definitions */ #define READ 0 #define WRITE 1