Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f96608e authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: ethernet: hix5hd2: use phydev from struct net_device 



The private structure contain a pointer to phydev, but the structure
net_device already contain such pointer. So we can remove the pointer
phy in the private structure, and update the driver to use the
one contained in struct net_device.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 644afe23

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

+13 −17
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ struct hix5hd2_priv { 
	struct device *dev;

	struct net_device *netdev;



	struct phy_device *phy;

	struct device_node *phy_node;

	phy_interface_t	phy_mode;
@@ -402,7 +401,7 @@ static int hix5hd2_net_set_mac_address(struct net_device *dev, void *p) 
static void hix5hd2_adjust_link(struct net_device *dev)

{

	struct hix5hd2_priv *priv = netdev_priv(dev);

	struct phy_device *phy = priv->phy;

	struct phy_device *phy = dev->phydev;



	if ((priv->speed != phy->speed) || (priv->duplex != phy->duplex)) {

		hix5hd2_config_port(dev, phy->speed, phy->duplex);
@@ -679,6 +678,7 @@ static void hix5hd2_free_dma_desc_rings(struct hix5hd2_priv *priv) 
static int hix5hd2_net_open(struct net_device *dev)

{

	struct hix5hd2_priv *priv = netdev_priv(dev);

	struct phy_device *phy;

	int ret;



	ret = clk_prepare_enable(priv->clk);
@@ -687,12 +687,12 @@ static int hix5hd2_net_open(struct net_device *dev) 
		return ret;

	}



	priv->phy = of_phy_connect(dev, priv->phy_node,

	phy = of_phy_connect(dev, priv->phy_node,

			     &hix5hd2_adjust_link, 0, priv->phy_mode);

	if (!priv->phy)

	if (!phy)

		return -ENODEV;



	phy_start(priv->phy);

	phy_start(phy);

	hix5hd2_hw_init(priv);

	hix5hd2_rx_refill(priv);
@@ -716,9 +716,9 @@ static int hix5hd2_net_close(struct net_device *dev) 
	netif_stop_queue(dev);

	hix5hd2_free_dma_desc_rings(priv);



	if (priv->phy) {

		phy_stop(priv->phy);

		phy_disconnect(priv->phy);

	if (dev->phydev) {

		phy_stop(dev->phydev);

		phy_disconnect(dev->phydev);

	}



	clk_disable_unprepare(priv->clk);
@@ -753,23 +753,19 @@ static const struct net_device_ops hix5hd2_netdev_ops = { 
static int hix5hd2_get_settings(struct net_device *net_dev,

				struct ethtool_cmd *cmd)

{

	struct hix5hd2_priv *priv = netdev_priv(net_dev);



	if (!priv->phy)

	if (!net_dev->phydev)

		return -ENODEV;



	return phy_ethtool_gset(priv->phy, cmd);

	return phy_ethtool_gset(net_dev->phydev, cmd);

}



static int hix5hd2_set_settings(struct net_device *net_dev,

				struct ethtool_cmd *cmd)

{

	struct hix5hd2_priv *priv = netdev_priv(net_dev);



	if (!priv->phy)

	if (!net_dev->phydev)

		return -ENODEV;



	return phy_ethtool_sset(priv->phy, cmd);

	return phy_ethtool_sset(net_dev->phydev, cmd);

}



static struct ethtool_ops hix5hd2_ethtools_ops = {