Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[cascardo/linux.git] / drivers / net / ethernet / netx-eth.c

diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index cb9e638..dc2c6f5 100644 (file)
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -422,7 +422,6 @@ exit_free_pfifo:
 exit_free_xc:
        free_xc(priv->xc);
 exit_free_netdev:
-       platform_set_drvdata(pdev, NULL);
        free_netdev(ndev);
 exit:
        return ret;
@@ -430,11 +429,9 @@ exit:
 
 static int netx_eth_drv_remove(struct platform_device *pdev)
 {
-       struct net_device *ndev = dev_get_drvdata(&pdev->dev);
+       struct net_device *ndev = platform_get_drvdata(pdev);
        struct netx_eth_priv *priv = netdev_priv(ndev);
 
-       platform_set_drvdata(pdev, NULL);
-
        unregister_netdev(ndev);
        xc_stop(priv->xc);
        free_xc(priv->xc);