[PATCH 00/15] drivers: net: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 01/15] 3c59x: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 03/15] ethernet: amd: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 03/15] ethernet: amd: use IS_ENABLED() instead of checking for built-in or module · Geert Uytterhoeven <geert@linux-m68k.org> · 2016-09-12
[PATCH 05/15] sundance: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 06/15] net/fsl_pq_mdio: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 07/15] i825xx: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 08/15] ixgbe: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 08/15] ixgbe: use IS_ENABLED() instead of checking for built-in or module · Greg <hidden> · 2016-09-12
[PATCH 09/15] net: mvneta: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 10/15] natsemi: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 11/15] sfc: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 11/15] sfc: use IS_ENABLED() instead of checking for built-in or module · Bert Kenward <hidden> · 2016-09-12
[PATCH 13/15] stmmac: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 13/15] stmmac: use IS_ENABLED() instead of checking for built-in or module · Alexandre Torgue <hidden> · 2016-09-12
[PATCH 15/15] iwlegacy: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 14/15] hamradio: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 12/15] sis900: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 12/15] sis900: use IS_ENABLED() instead of checking for built-in or module · Daniele Venzano <venza@brownhat.org> · 2016-09-12
[PATCH 04/15] bnx2: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 02/15] starfire: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 00/15] drivers: net: use IS_ENABLED() instead of checking for built-in or module · David Miller <davem@davemloft.net> · 2016-09-13

[PATCH 06/15] net/fsl_pq_mdio: use IS_ENABLED() instead of checking for built-in or module

STALE3684d

From: Javier Martinez Canillas <hidden>
Date: 2016-09-12 14:04:43
Also in: lkml
Subsystem: networking drivers, the rest · Maintainers: Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

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 <redacted>
---

 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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help