From e550c3d41c37e07e80d76ee932b5d26aa636b9d0 Mon Sep 17 00:00:00 2001

From: Dan Murphy <dmurphy@ti.com>

Date: Fri, 5 Jun 2020 09:01:06 -0500

Subject: [PATCH] net: marvell: Fix OF_MDIO config check

Git-commit: 5cd119d9a05f1c1a08778a7305b4ca0f16bc1e20

References: git-fixes

Patch-mainline: v5.8-rc1

When CONFIG_OF_MDIO is set to be a module the code block is not

compiled. Use the IS_ENABLED macro that checks for both built in as

well as module.

Fixes: cf41a51db8985 ("of/phylib: Use device tree properties to initialize Marvell PHYs.")

Signed-off-by: Dan Murphy <dmurphy@ti.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/phy/marvell.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c

index 6eaeb7dd8826..4d8a49598204 100644

--- a/drivers/net/phy/marvell.c

+++ b/drivers/net/phy/marvell.c

@@ -377,7 +377,7 @@ static int m88e1111_config_aneg(struct phy_device *phydev)

 	return 0;

 }

-#ifdef CONFIG_OF_MDIO

+#if IS_ENABLED(CONFIG_OF_MDIO)

 /* Set and/or override some configuration registers based on the

  * marvell,reg-init property stored in the of_node for the phydev.

  *

-- 

2.16.4