Commit d5f3c81c authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller
Browse files

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: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5436fb3f

drivers/net/usb/asix.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};

drivers/net/usb/asix_devices.c

+10 −9
Original line number Diff line number Diff line
@@ -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 = mdiobus_get_phy(priv->mdio, priv->phy_addr);

	if (!priv->phydev) {

		netdev_err(dev->net, "Could not find PHY\n");

		return -ENODEV;

	}



	priv->phydev = phy_connect(dev->net, priv->phy_name, &asix_adjust_link,

	ret = phy_connect_direct(dev->net, priv->phydev, &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);

	if (ret) {

		netdev_err(dev->net, "Could not connect PHY\n");

		return ret;

	}