Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / net / ethernet / amd / sunlance.c

diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index f47b780892e97f4a4e5ca186e08ee1679f4eee6c..ece56831a647a9e1d93cbdcab7fed2842b6cd549 100644 (file)
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1470,7 +1470,7 @@ no_link_test:
                goto fail;
        }
 
-       dev_set_drvdata(&op->dev, lp);
+       platform_set_drvdata(op, lp);
 
        printk(KERN_INFO "%s: LANCE %pM\n",
               dev->name, dev->dev_addr);
@@ -1501,7 +1501,7 @@ static int sunlance_sbus_probe(struct platform_device *op)
 
 static int sunlance_sbus_remove(struct platform_device *op)
 {
-       struct lance_private *lp = dev_get_drvdata(&op->dev);
+       struct lance_private *lp = platform_get_drvdata(op);
        struct net_device *net_dev = lp->dev;
 
        unregister_netdev(net_dev);
@@ -1510,8 +1510,6 @@ static int sunlance_sbus_remove(struct platform_device *op)
 
        free_netdev(net_dev);
 
-       dev_set_drvdata(&op->dev, NULL);
-
        return 0;
 }