aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:22 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:45 -0500
commit5bc7ec702fd7680eb12be88ada87742db9676f5c (patch)
tree7e07184e68c806708caa30cf8586900a6d0afc93
parent21524526b3ec66329cba682f11fdba77c8b0e698 (diff)
net/octeon_mgmt: 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/octeon/octeon_mgmt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index f97719c48516..b5499198e029 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -1419,7 +1419,7 @@ static const struct net_device_ops octeon_mgmt_ops = {
1419#endif 1419#endif
1420}; 1420};
1421 1421
1422static int __devinit octeon_mgmt_probe(struct platform_device *pdev) 1422static int octeon_mgmt_probe(struct platform_device *pdev)
1423{ 1423{
1424 struct net_device *netdev; 1424 struct net_device *netdev;
1425 struct octeon_mgmt *p; 1425 struct octeon_mgmt *p;
@@ -1559,7 +1559,7 @@ err:
1559 return result; 1559 return result;
1560} 1560}
1561 1561
1562static int __devexit octeon_mgmt_remove(struct platform_device *pdev) 1562static int octeon_mgmt_remove(struct platform_device *pdev)
1563{ 1563{
1564 struct net_device *netdev = dev_get_drvdata(&pdev->dev); 1564 struct net_device *netdev = dev_get_drvdata(&pdev->dev);
1565 1565
@@ -1583,7 +1583,7 @@ static struct platform_driver octeon_mgmt_driver = {
1583 .of_match_table = octeon_mgmt_match, 1583 .of_match_table = octeon_mgmt_match,
1584 }, 1584 },
1585 .probe = octeon_mgmt_probe, 1585 .probe = octeon_mgmt_probe,
1586 .remove = __devexit_p(octeon_mgmt_remove), 1586 .remove = octeon_mgmt_remove,
1587}; 1587};
1588 1588
1589extern void octeon_mdiobus_force_mod_depencency(void); 1589extern void octeon_mdiobus_force_mod_depencency(void);