kernel: rtl8366_smi: guard of_mdiobus_register() call
authorJo-Philipp Wich <jo@mein.io>
Fri, 11 May 2018 13:07:56 +0000 (15:07 +0200)
committerJo-Philipp Wich <jo@mein.io>
Fri, 11 May 2018 13:07:56 +0000 (15:07 +0200)
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>
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c

index 08732242255fe4b100c617ad522628c58e84ba03..c21ad9425de596908aeea750c4b97bf0a38baf07 100644 (file)
@@ -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;
 static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 {
        int ret;
-       struct device_node *np = NULL;
 
 #ifdef CONFIG_OF
 
 #ifdef CONFIG_OF
+       struct device_node *np = NULL;
+
        np = of_get_child_by_name(smi->parent->of_node, "mdio-bus");
 #endif
 
        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
 
        }
 #endif
 
+#ifdef CONFIG_OF
        if (np)
                ret = of_mdiobus_register(smi->mii_bus, np);
        else
        if (np)
                ret = of_mdiobus_register(smi->mii_bus, np);
        else
+#endif
                ret = mdiobus_register(smi->mii_bus);
                ret = mdiobus_register(smi->mii_bus);
+
        if (ret)
                goto err_free;
 
        if (ret)
                goto err_free;