From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 11 May 2018 13:07:56 +0000 (+0200)
Subject: kernel: rtl8366_smi: guard of_mdiobus_register() call
X-Git-Tag: v18.06.0-rc1~221
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8c7cd9cb15a51cbbf5dba9aab63da3addee9d87;p=oweals%2Fopenwrt.git

kernel: rtl8366_smi: guard of_mdiobus_register() call

Make the call to of_mdiobus_register() dependant on CONFIG_OF to avoid
pulling in an unwanted dependency on of_mdio.ko.

Fixes: 3dc523f232 kernel: add OF support to rtl8355 driver
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 0873224225..c21ad9425d 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -916,9 +916,10 @@ static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
 static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 {
 	int ret;
-	struct device_node *np = NULL;
 
 #ifdef CONFIG_OF
+	struct device_node *np = NULL;
+
 	np = of_get_child_by_name(smi->parent->of_node, "mdio-bus");
 #endif
 
@@ -945,10 +946,13 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 	}
 #endif
 
+#ifdef CONFIG_OF
 	if (np)
 		ret = of_mdiobus_register(smi->mii_bus, np);
 	else
+#endif
 		ret = mdiobus_register(smi->mii_bus);
+
 	if (ret)
 		goto err_free;