From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
Zhao Qiang <qiang.zhao@freescale.com>,
Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org,
Gerlando Falauto <gerlando.falauto@keymile.com>,
"David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH 06/15] net/fsl_pq_mdio: use IS_ENABLED() instead of checking for built-in or module
Date: Mon, 12 Sep 2016 10:03:37 -0400 [thread overview]
Message-ID: <1473689026-6983-7-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1473689026-6983-1-git-send-email-javier@osg.samsung.com>
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 <javier@osg.samsung.com>
---
drivers/net/ethernet/freescale/fsl_pq_mdio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index f3c63dce1e30..446c7b374ff5 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -195,7 +195,7 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus)
return 0;
}
-#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
+#if IS_ENABLED(CONFIG_GIANFAR)
/*
* Return the TBIPA address, starting from the address
* of the mapped GFAR MDIO registers (struct gfar)
@@ -228,7 +228,7 @@ static uint32_t __iomem *get_etsec_tbipa(void __iomem *p)
}
#endif
-#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)
+#if IS_ENABLED(CONFIG_UCC_GETH)
/*
* Return the TBIPAR address for a QE MDIO node, starting from the address
* of the mapped MII registers (struct fsl_pq_mii)
@@ -306,7 +306,7 @@ static void ucc_configure(phys_addr_t start, phys_addr_t end)
#endif
static const struct of_device_id fsl_pq_mdio_match[] = {
-#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
+#if IS_ENABLED(CONFIG_GIANFAR)
{
.compatible = "fsl,gianfar-tbi",
.data = &(struct fsl_pq_mdio_data) {
@@ -344,7 +344,7 @@ static const struct of_device_id fsl_pq_mdio_match[] = {
},
},
#endif
-#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)
+#if IS_ENABLED(CONFIG_UCC_GETH)
{
.compatible = "fsl,ucc-mdio",
.data = &(struct fsl_pq_mdio_data) {
--
2.7.4
next prev parent reply other threads:[~2016-09-12 14:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 14:03 [PATCH 00/15] drivers: net: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 01/15] 3c59x: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 02/15] starfire: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 03/15] ethernet: amd: " Javier Martinez Canillas
2016-09-12 14:11 ` Geert Uytterhoeven
2016-09-12 14:03 ` [PATCH 04/15] bnx2: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 05/15] sundance: " Javier Martinez Canillas
2016-09-12 14:03 ` Javier Martinez Canillas [this message]
2016-09-12 14:03 ` [PATCH 07/15] i825xx: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 08/15] ixgbe: " Javier Martinez Canillas
2016-09-12 15:36 ` Greg
2016-09-12 14:03 ` [PATCH 09/15] net: mvneta: " Javier Martinez Canillas
2016-09-12 14:06 ` Gregory CLEMENT
2016-09-12 14:03 ` [PATCH 10/15] natsemi: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 11/15] sfc: " Javier Martinez Canillas
2016-09-12 14:31 ` Bert Kenward
2016-09-12 14:03 ` [PATCH 12/15] sis900: " Javier Martinez Canillas
2016-09-12 17:10 ` Daniele Venzano
2016-09-12 14:03 ` [PATCH 13/15] stmmac: " Javier Martinez Canillas
2016-09-12 16:47 ` Alexandre Torgue
2016-09-12 14:03 ` [PATCH 14/15] hamradio: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 15/15] iwlegacy: " Javier Martinez Canillas
2016-09-13 3:28 ` [PATCH 00/15] drivers: net: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473689026-6983-7-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gerlando.falauto@keymile.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=qiang.zhao@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®