Commit 08cc0ec9 authored Jun 05, 2020 by Dan Murphy Committed by Greg Kroah-Hartman Jun 24, 2020

net: marvell: Fix OF_MDIO config check



[ Upstream commit 5cd119d9a05f1c1a08778a7305b4ca0f16bc1e20 ]

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: cf41a51d ("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: Sasha Levin <sashal@kernel.org>

parent fbaf0137

drivers/net/phy/marvell.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ static int m88e1101_config_aneg(struct phy_device *phydev)
		return marvell_config_aneg(phydev);
		}

		#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.
		*