aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:45 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:53 -0500
commit663e12e61d8764ce342588325d1050d9cb5460c0 (patch)
tree266aa35199fb189891e4cdd15ffabc73e2b6454a
parent369158767af29ed54f3751f80222e751cf60236c (diff)
cpsw: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/ti/cpsw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index c9714e1c164a..40aff684aa23 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1136,7 +1136,7 @@ error_ret:
1136 return ret; 1136 return ret;
1137} 1137}
1138 1138
1139static int __devinit cpsw_probe(struct platform_device *pdev) 1139static int cpsw_probe(struct platform_device *pdev)
1140{ 1140{
1141 struct cpsw_platform_data *data = pdev->dev.platform_data; 1141 struct cpsw_platform_data *data = pdev->dev.platform_data;
1142 struct net_device *ndev; 1142 struct net_device *ndev;
@@ -1398,7 +1398,7 @@ clean_ndev_ret:
1398 return ret; 1398 return ret;
1399} 1399}
1400 1400
1401static int __devexit cpsw_remove(struct platform_device *pdev) 1401static int cpsw_remove(struct platform_device *pdev)
1402{ 1402{
1403 struct net_device *ndev = platform_get_drvdata(pdev); 1403 struct net_device *ndev = platform_get_drvdata(pdev);
1404 struct cpsw_priv *priv = netdev_priv(ndev); 1404 struct cpsw_priv *priv = netdev_priv(ndev);
@@ -1467,7 +1467,7 @@ static struct platform_driver cpsw_driver = {
1467 .of_match_table = of_match_ptr(cpsw_of_mtable), 1467 .of_match_table = of_match_ptr(cpsw_of_mtable),
1468 }, 1468 },
1469 .probe = cpsw_probe, 1469 .probe = cpsw_probe,
1470 .remove = __devexit_p(cpsw_remove), 1470 .remove = cpsw_remove,
1471}; 1471};
1472 1472
1473static int __init cpsw_init(void) 1473static int __init cpsw_init(void)