aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale/fec_mpc52xx.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-22 20:52:31 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-26 00:27:58 -0400
commit8513fbd880093f00a47e85a552f14ca2de8d84d6 (patch)
tree6f061e2e9b87983cd91688bff5238c730db79137 /drivers/net/ethernet/freescale/fec_mpc52xx.c
parent6d0bfe22611602f36617bc7aa2ffa1bbb2f54c67 (diff)
net: ethernet: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Also, unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_mpc52xx.c')
-rw-r--r--drivers/net/ethernet/freescale/fec_mpc52xx.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 9bc15e2365bb..9947765e90c5 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -981,7 +981,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)
981 goto err_node; 981 goto err_node;
982 982
983 /* We're done ! */ 983 /* We're done ! */
984 dev_set_drvdata(&op->dev, ndev); 984 platform_set_drvdata(op, ndev);
985 netdev_info(ndev, "%s MAC %pM\n", 985 netdev_info(ndev, "%s MAC %pM\n",
986 op->dev.of_node->full_name, ndev->dev_addr); 986 op->dev.of_node->full_name, ndev->dev_addr);
987 987
@@ -1010,7 +1010,7 @@ mpc52xx_fec_remove(struct platform_device *op)
1010 struct net_device *ndev; 1010 struct net_device *ndev;
1011 struct mpc52xx_fec_priv *priv; 1011 struct mpc52xx_fec_priv *priv;
1012 1012
1013 ndev = dev_get_drvdata(&op->dev); 1013 ndev = platform_get_drvdata(op);
1014 priv = netdev_priv(ndev); 1014 priv = netdev_priv(ndev);
1015 1015
1016 unregister_netdev(ndev); 1016 unregister_netdev(ndev);
@@ -1030,14 +1030,13 @@ mpc52xx_fec_remove(struct platform_device *op)
1030 1030
1031 free_netdev(ndev); 1031 free_netdev(ndev);
1032 1032
1033 dev_set_drvdata(&op->dev, NULL);
1034 return 0; 1033 return 0;
1035} 1034}
1036 1035
1037#ifdef CONFIG_PM 1036#ifdef CONFIG_PM
1038static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state) 1037static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state)
1039{ 1038{
1040 struct net_device *dev = dev_get_drvdata(&op->dev); 1039 struct net_device *dev = platform_get_drvdata(op);
1041 1040
1042 if (netif_running(dev)) 1041 if (netif_running(dev))
1043 mpc52xx_fec_close(dev); 1042 mpc52xx_fec_close(dev);
@@ -1047,7 +1046,7 @@ static int mpc52xx_fec_of_suspend(struct platform_device *op, pm_message_t state
1047 1046
1048static int mpc52xx_fec_of_resume(struct platform_device *op) 1047static int mpc52xx_fec_of_resume(struct platform_device *op)
1049{ 1048{
1050 struct net_device *dev = dev_get_drvdata(&op->dev); 1049 struct net_device *dev = platform_get_drvdata(op);
1051 1050
1052 mpc52xx_fec_hw_init(dev); 1051 mpc52xx_fec_hw_init(dev);
1053 mpc52xx_fec_reset_stats(dev); 1052 mpc52xx_fec_reset_stats(dev);