net: phy: Add phy_sysfs_create_links helper function
authorVladimir Oltean <olteanv@gmail.com>
Tue, 28 May 2019 17:38:07 +0000 (20:38 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2019 04:48:53 +0000 (21:48 -0700)
This is a cosmetic patch that wraps the operation of creating sysfs
links between the netdev->phydev and the phydev->attached_dev.

This is needed to keep the indentation level in check in a follow-up
patch where this function will be guarded against the existence of a
phydev->attached_dev.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy_device.c

index 5d288da..8fd1bf3 100644 (file)
@@ -1133,6 +1133,31 @@ void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)
 }
 EXPORT_SYMBOL(phy_attached_print);
 
+static void phy_sysfs_create_links(struct phy_device *phydev)
+{
+       struct net_device *dev = phydev->attached_dev;
+       int err;
+
+       err = sysfs_create_link(&phydev->mdio.dev.kobj, &dev->dev.kobj,
+                               "attached_dev");
+       if (err)
+               return;
+
+       err = sysfs_create_link_nowarn(&dev->dev.kobj,
+                                      &phydev->mdio.dev.kobj,
+                                      "phydev");
+       if (err) {
+               dev_err(&dev->dev, "could not add device link to %s err %d\n",
+                       kobject_name(&phydev->mdio.dev.kobj),
+                       err);
+               /* non-fatal - some net drivers can use one netdevice
+                * with more then one phy
+                */
+       }
+
+       phydev->sysfs_links = true;
+}
+
 /**
  * phy_attach_direct - attach a network device to a given PHY device pointer
  * @dev: network device to attach
@@ -1216,23 +1241,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
         */
        phydev->sysfs_links = false;
 
-       err = sysfs_create_link(&phydev->mdio.dev.kobj, &dev->dev.kobj,
-                               "attached_dev");
-       if (!err) {
-               err = sysfs_create_link_nowarn(&dev->dev.kobj,
-                                              &phydev->mdio.dev.kobj,
-                                              "phydev");
-               if (err) {
-                       dev_err(&dev->dev, "could not add device link to %s err %d\n",
-                               kobject_name(&phydev->mdio.dev.kobj),
-                               err);
-                       /* non-fatal - some net drivers can use one netdevice
-                        * with more then one phy
-                        */
-               }
-
-               phydev->sysfs_links = true;
-       }
+       phy_sysfs_create_links(phydev);
 
        phydev->dev_flags = flags;