From patchwork Mon Aug 29 09:32:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 9303345 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 8F4E3607F0 for ; Mon, 29 Aug 2016 09:34:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EE1328716 for ; Mon, 29 Aug 2016 09:34:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 736BA2872E; Mon, 29 Aug 2016 09:34:22 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6089128716 for ; Mon, 29 Aug 2016 09:34:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1beIvt-0005wP-G5; Mon, 29 Aug 2016 09:32:45 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beIvo-0005p8-QG for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2016 09:32:42 +0000 Received: by mail-pa0-x244.google.com with SMTP id ez1so8660663pab.3 for ; Mon, 29 Aug 2016 02:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dowhile0-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=MyAoU20LOuB/2A8tyZBz+Q0dyzYFxZlLxKf+e7rQrA0=; b=IwBeeKr2iCSUsB1tlba2F3mDUFEDBJAHIcAGJkX6b5WPduk/3jMIPrP2eKddgT0KSB xbphkgCMocIhf7yFGAG7h5jyTerkoFhBjlGrt0aD/ypFIUTV5aV60X3sff0D24mGH9u7 +7D04CQiUiKMLpWJHyrM6en3ERjrQEZ401OzKMD5ZTMv8Ue9fNq7g2znbXQI2LCUVlKv T5OMIAXLT5wz/Xf3xi1guH88r5TIAOP4avfYEtHiMrk1c8WL+Tu7RarUFOXH0wZ+UXs0 arNR1UayS6rnJP2ft4uRgIpmARYNBITm8dLSu8/LnwmqCA2xozwr8bW0AYKcfldf9zNe v0Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MyAoU20LOuB/2A8tyZBz+Q0dyzYFxZlLxKf+e7rQrA0=; b=Cfv0KtQVAkP+zIcpzUTKIfE8YaPxlOW9vesKSjM+p5a+U9D8ZiK67rOcO/nKvU857L vJ6ro6J6uKHtP6d4eGRiMH2KfxGJO3a8o5yDxPN65pRqdJEzgyH1igASqWzo8Vrovj1p OCrBLMTsDkVrxjBUDBj05yAyMiKBlpRGiJoEr6eclPd862sdJU7qrhMjR4D6yvBweJ8M ZlQm03H6JhJUKCDyNQ/ifOF18vBWTG3GhfmIl0zWJJQplMPF1/LAhqfweGKS8eqyfnj4 boGYk46Cs4zJWPZVYRxGBOKNz19bBiHfkhI62jtcadaRzpA+qXU2u+x/rksrn2hehKlr EAng== X-Gm-Message-State: AE9vXwPUjpcIo6VcW3FlqdiufzmaUrfkCWDJL4E3AO4JhXd6RFBj3kC3pJqpcdfOIf9/jg== X-Received: by 10.66.242.201 with SMTP id ws9mr31169560pac.7.1472463139472; Mon, 29 Aug 2016 02:32:19 -0700 (PDT) Received: from minerva.sisa.samsung.com (62.57.161.25.dyn.user.ono.com. [62.57.161.25]) by smtp.gmail.com with ESMTPSA id fe8sm47771524pad.2.2016.08.29.02.32.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Aug 2016 02:32:18 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH] ARM: imx: use IS_ENABLED() instead of checking for built-in or module Date: Mon, 29 Aug 2016 11:32:11 +0200 Message-Id: <1472463131-29899-1-git-send-email-javier@dowhile0.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160829_023240_984307_6919640C X-CRM114-Status: GOOD ( 11.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Javier Martinez Canillas , Sascha Hauer , Fabio Estevam , Javier Martinez Canillas , Shawn Guo , linux-arm-kernel@lists.infradead.org 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 From: Javier Martinez Canillas The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either built-in or as a module, use that macro instead of open coding the same. Using the macro makes the code more readable by helping abstract away some of the Kconfig built-in and module enable details. Signed-off-by: Javier Martinez Canillas Signed-off-by: Javier Martinez Canillas --- arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 31df4361996f..e277d9c230e5 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c @@ -63,7 +63,7 @@ */ #define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050) -#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) +#if IS_ENABLED(CONFIG_SERIAL_8250) /* * KZM-ARM11-01 has an external UART on FPGA */ @@ -141,7 +141,7 @@ static inline int kzm_init_ext_uart(void) /* * SMSC LAN9118 */ -#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) +#if IS_ENABLED(CONFIG_SMSC911X) static struct smsc911x_platform_config kzm_smsc9118_config = { .phy_interface = PHY_INTERFACE_MODE_MII, .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, @@ -201,7 +201,7 @@ static inline int kzm_init_smsc9118(void) } #endif -#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) +#if IS_ENABLED(CONFIG_SERIAL_IMX) static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, };