This reverts commit 94656823c1ac31b35549fc0d96cd7862254e7c3d. platform_set_drvdata is needed in order to destroy phylink on platform device removal. Signed-off-by: Rosen Penev --- drivers/net/ethernet/atheros/ag71xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index f2f12642529e..7114f2970ac6 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -1921,6 +1921,8 @@ static int ag71xx_probe(struct platform_device *pdev) if (err) return err; + platform_set_drvdata(pdev, ndev); + err = ag71xx_phylink_setup(ag); if (err) return dev_err_probe(&pdev->dev, err, @@ -1929,6 +1931,7 @@ static int ag71xx_probe(struct platform_device *pdev) err = register_netdev(ndev); if (err) { netif_err(ag, probe, ndev, "unable to register net device\n"); + platform_set_drvdata(pdev, NULL); return err; } @@ -2035,7 +2038,7 @@ MODULE_DEVICE_TABLE(of, ag71xx_match); static struct platform_driver ag71xx_driver = { .probe = ag71xx_probe, - .remove_new = ag71xx_remove, + .remove = ag71xx_remove, .driver = { .name = "ag71xx", .of_match_table = ag71xx_match, -- 2.52.0