net: phy: adjust fixed_phy_register() return value

Adjust fixed_phy_register() to return struct phy_device *, so that
it becomes easy to use fixed PHYs without device tree support:

  phydev = fixed_phy_register(PHY_POLL, &fixed_phy_status, NULL);
  fixed_phy_set_link_update(phydev, fixed_phy_link_update);
  phy_connect_direct(netdev, phydev, handler_fn, phy_interface);

This change is a prerequisite for modifying bcmgenet driver to work
without a device tree on Broadcom's MIPS-based 7xxx platforms.

Signed-off-by: Petri Gynther <pgynther@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index 941138664c1d..f2ca1b459377 100644
--- 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)
 {