Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / include / linux / phy_fixed.h

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index 941138664c1db88c61e83fe53fdaf6fc31c73b7b..f2ca1b459377803094005029cc765ef1f3a9abd6 100644 (file)
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -14,9 +14,9 @@ struct device_node;
 #ifdef CONFIG_FIXED_PHY
 extern int fixed_phy_add(unsigned int irq, int phy_id,
                         struct fixed_phy_status *status);
-extern int fixed_phy_register(unsigned int irq,
-                             struct fixed_phy_status *status,
-                             struct device_node *np);
+extern struct phy_device *fixed_phy_register(unsigned int irq,
+                                            struct fixed_phy_status *status,
+                                            struct device_node *np);
 extern void fixed_phy_del(int phy_addr);
 extern int fixed_phy_set_link_update(struct phy_device *phydev,
                        int (*link_update)(struct net_device *,
@@ -27,11 +27,11 @@ static inline int fixed_phy_add(unsigned int irq, int phy_id,
 {
        return -ENODEV;
 }
-static inline int fixed_phy_register(unsigned int irq,
-                                    struct fixed_phy_status *status,
-                                    struct device_node *np)
+static inline struct phy_device *fixed_phy_register(unsigned int irq,
+                                               struct fixed_phy_status *status,
+                                               struct device_node *np)
 {
-       return -ENODEV;
+       return ERR_PTR(-ENODEV);
 }
 static inline int fixed_phy_del(int phy_addr)
 {