Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / include / linux / of_mdio.h

diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 4b04587d044197dd5b1bbf0eb3ece564fffdf112..2ab233661ae5da49cac59c33c38433501b1af4b4 100644 (file)
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -19,6 +19,9 @@ extern struct phy_device *of_phy_connect(struct net_device *dev,
                                         struct device_node *phy_np,
                                         void (*hndlr)(struct net_device *),
                                         u32 flags, phy_interface_t iface);
+extern struct phy_device *
+of_phy_get_and_connect(struct net_device *dev, struct device_node *np,
+                      void (*hndlr)(struct net_device *));
 struct phy_device *of_phy_attach(struct net_device *dev,
                                 struct device_node *phy_np, u32 flags,
                                 phy_interface_t iface);
@@ -52,6 +55,13 @@ static inline struct phy_device *of_phy_connect(struct net_device *dev,
        return NULL;
 }
 
+static inline struct phy_device *
+of_phy_get_and_connect(struct net_device *dev, struct device_node *np,
+                      void (*hndlr)(struct net_device *))
+{
+       return NULL;
+}
+
 static inline struct phy_device *of_phy_attach(struct net_device *dev,
                                               struct device_node *phy_np,
                                               u32 flags, phy_interface_t iface)