net: usb: asix: make use of mdiobus_get_phy and phy_connect_direct

In most cases we use own mdio bus, there is no need to create and store
string for the PHY address.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/asix.h b/drivers/net/usb/asix.h
index 691f37f4523831d00a10ba8b71ea2892ef4c02aa..072760d76a725941878893993335c0f7354d037b 100644 (file)
--- a/drivers/net/usb/asix.h
+++ b/drivers/net/usb/asix.h
@@ -184,7 +184,6 @@ struct asix_common_private {
        struct mii_bus *mdio;
        struct phy_device *phydev;
        u16 phy_addr;
-       char phy_name[20];
        bool embd_phy;
        u8 chipcode;
 };

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 34622c1adacf3d17de86e5c1ee2eadf2303df8ee..fb617eb551bb04b8562d52cac3f005ebf59641bf 100644 (file)
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -661,15 +661,16 @@ static int ax88772_init_phy(struct usbnet *dev)
        struct asix_common_private *priv = dev->driver_priv;
        int ret;
 
-       snprintf(priv->phy_name, sizeof(priv->phy_name), PHY_ID_FMT,
-                priv->mdio->id, priv->phy_addr);
-
-       priv->phydev = phy_connect(dev->net, priv->phy_name, &asix_adjust_link,
-                                  PHY_INTERFACE_MODE_INTERNAL);
-       if (IS_ERR(priv->phydev)) {
-               netdev_err(dev->net, "Could not connect to PHY device %s\n",
-                          priv->phy_name);
-               ret = PTR_ERR(priv->phydev);
+       priv->phydev = mdiobus_get_phy(priv->mdio, priv->phy_addr);
+       if (!priv->phydev) {
+               netdev_err(dev->net, "Could not find PHY\n");
+               return -ENODEV;
+       }
+
+       ret = phy_connect_direct(dev->net, priv->phydev, &asix_adjust_link,
+                                PHY_INTERFACE_MODE_INTERNAL);
+       if (ret) {
+               netdev_err(dev->net, "Could not connect PHY\n");
                return ret;
        }