[openwrt/openwrt] kernel: rtl8366_smi: guard of_mdiobus_register() call

LEDE Commits lede-commits at lists.infradead.org
Fri May 11 06:38:18 PDT 2018


jow pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/d8c7cd9cb15a51cbbf5dba9aab63da3addee9d87

commit d8c7cd9cb15a51cbbf5dba9aab63da3addee9d87
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri May 11 15:07:56 2018 +0200

    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 at mein.io>
---
 target/linux/generic/files/drivers/net/phy/rtl8366_smi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 0873224..c21ad94 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;
 



More information about the lede-commits mailing list