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

Commit ea7a2b9a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hisilicon-netdev-dev' 



Dongpo Li says:

====================
net: ethernet: hisilicon: set dev->dev.parent before PHY connect

This patch series builds atop:
ec988ad7 ("phy: Don't increment MDIO bus
refcount unless it's a different owner")

I have checked all the hisilicon ethernet driver and found only two drivers
need to be fixed to make sure set dev->dev.parent before PHY connect.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 66e2809d 8cd1f70f

drivers/net/ethernet/hisilicon/hip04_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	priv = netdev_priv(ndev);

	priv->ndev = ndev;

	platform_set_drvdata(pdev, ndev);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(d, res);
@@ -903,7 +904,6 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	ndev->priv_flags |= IFF_UNICAST_FLT;

	ndev->irq = irq;

	netif_napi_add(ndev, &priv->napi, hip04_rx_poll, NAPI_POLL_WEIGHT);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	hip04_reset_ppe(priv);

	if (priv->phy_mode == PHY_INTERFACE_MODE_MII)

drivers/net/ethernet/hisilicon/hisi_femac.c

+1 −1
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
		return -ENOMEM;



	platform_set_drvdata(pdev, ndev);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	priv = netdev_priv(ndev);

	priv->dev = dev;
@@ -882,7 +883,6 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
	ndev->netdev_ops = &hisi_femac_netdev_ops;

	ndev->ethtool_ops = &hisi_femac_ethtools_ops;

	netif_napi_add(ndev, &priv->napi, hisi_femac_poll, FEMAC_POLL_WEIGHT);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	hisi_femac_port_init(priv);