| From 86a32766f788743cf035a72a097e3b39d7616ca5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 5 Jun 2020 09:01:06 -0500 |
| Subject: net: marvell: Fix OF_MDIO config check |
| |
| From: Dan Murphy <dmurphy@ti.com> |
| |
| [ 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: 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: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 a7796134e3be0..91cf1d1672637 100644 |
| --- a/drivers/net/phy/marvell.c |
| +++ b/drivers/net/phy/marvell.c |
| @@ -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. |
| * |
| -- |
| 2.25.1 |
| |
