diff options
author | David S. Miller <davem@davemloft.net> | 2012-12-03 15:35:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-03 15:35:28 -0500 |
commit | 682d7978aee072f411fc747d32954a8371dd7b1b (patch) | |
tree | eeda0abd33caeb14d0adbc5ffd2a9a8cbb4b2ac8 /drivers/net/ethernet/aeroflex/greth.c | |
parent | a5a81f0b9025867efb999d14a8dfc1907c5a4c3b (diff) | |
parent | 9f9a12f8ca79839c948464a37c5b557808278708 (diff) |
Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next
Networking: Remove __dev* markings from the networking drivers
This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.
Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.
Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aeroflex/greth.c')
-rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 9c77c736f171..aa53115bb38b 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c | |||
@@ -1376,7 +1376,7 @@ error: | |||
1376 | } | 1376 | } |
1377 | 1377 | ||
1378 | /* Initialize the GRETH MAC */ | 1378 | /* Initialize the GRETH MAC */ |
1379 | static int __devinit greth_of_probe(struct platform_device *ofdev) | 1379 | static int greth_of_probe(struct platform_device *ofdev) |
1380 | { | 1380 | { |
1381 | struct net_device *dev; | 1381 | struct net_device *dev; |
1382 | struct greth_private *greth; | 1382 | struct greth_private *greth; |
@@ -1576,7 +1576,7 @@ error1: | |||
1576 | return err; | 1576 | return err; |
1577 | } | 1577 | } |
1578 | 1578 | ||
1579 | static int __devexit greth_of_remove(struct platform_device *of_dev) | 1579 | static int greth_of_remove(struct platform_device *of_dev) |
1580 | { | 1580 | { |
1581 | struct net_device *ndev = dev_get_drvdata(&of_dev->dev); | 1581 | struct net_device *ndev = dev_get_drvdata(&of_dev->dev); |
1582 | struct greth_private *greth = netdev_priv(ndev); | 1582 | struct greth_private *greth = netdev_priv(ndev); |
@@ -1619,7 +1619,7 @@ static struct platform_driver greth_of_driver = { | |||
1619 | .of_match_table = greth_of_match, | 1619 | .of_match_table = greth_of_match, |
1620 | }, | 1620 | }, |
1621 | .probe = greth_of_probe, | 1621 | .probe = greth_of_probe, |
1622 | .remove = __devexit_p(greth_of_remove), | 1622 | .remove = greth_of_remove, |
1623 | }; | 1623 | }; |
1624 | 1624 | ||
1625 | module_platform_driver(greth_of_driver); | 1625 | module_platform_driver(greth_of_driver); |