Commit 0e1effe3 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

net/wiznet: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe4a57c5
...@@ -621,7 +621,7 @@ static const struct net_device_ops w5100_netdev_ops = { ...@@ -621,7 +621,7 @@ static const struct net_device_ops w5100_netdev_ops = {
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
}; };
static int __devinit w5100_hw_probe(struct platform_device *pdev) static int w5100_hw_probe(struct platform_device *pdev)
{ {
struct wiznet_platform_data *data = pdev->dev.platform_data; struct wiznet_platform_data *data = pdev->dev.platform_data;
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
...@@ -696,7 +696,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev) ...@@ -696,7 +696,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit w5100_probe(struct platform_device *pdev) static int w5100_probe(struct platform_device *pdev)
{ {
struct w5100_priv *priv; struct w5100_priv *priv;
struct net_device *ndev; struct net_device *ndev;
...@@ -739,7 +739,7 @@ static int __devinit w5100_probe(struct platform_device *pdev) ...@@ -739,7 +739,7 @@ static int __devinit w5100_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit w5100_remove(struct platform_device *pdev) static int w5100_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct w5100_priv *priv = netdev_priv(ndev); struct w5100_priv *priv = netdev_priv(ndev);
...@@ -799,7 +799,7 @@ static struct platform_driver w5100_driver = { ...@@ -799,7 +799,7 @@ static struct platform_driver w5100_driver = {
.pm = &w5100_pm_ops, .pm = &w5100_pm_ops,
}, },
.probe = w5100_probe, .probe = w5100_probe,
.remove = __devexit_p(w5100_remove), .remove = w5100_remove,
}; };
module_platform_driver(w5100_driver); module_platform_driver(w5100_driver);
...@@ -541,7 +541,7 @@ static const struct net_device_ops w5300_netdev_ops = { ...@@ -541,7 +541,7 @@ static const struct net_device_ops w5300_netdev_ops = {
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
}; };
static int __devinit w5300_hw_probe(struct platform_device *pdev) static int w5300_hw_probe(struct platform_device *pdev)
{ {
struct wiznet_platform_data *data = pdev->dev.platform_data; struct wiznet_platform_data *data = pdev->dev.platform_data;
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
...@@ -608,7 +608,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev) ...@@ -608,7 +608,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit w5300_probe(struct platform_device *pdev) static int w5300_probe(struct platform_device *pdev)
{ {
struct w5300_priv *priv; struct w5300_priv *priv;
struct net_device *ndev; struct net_device *ndev;
...@@ -651,7 +651,7 @@ static int __devinit w5300_probe(struct platform_device *pdev) ...@@ -651,7 +651,7 @@ static int __devinit w5300_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit w5300_remove(struct platform_device *pdev) static int w5300_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct w5300_priv *priv = netdev_priv(ndev); struct w5300_priv *priv = netdev_priv(ndev);
...@@ -711,7 +711,7 @@ static struct platform_driver w5300_driver = { ...@@ -711,7 +711,7 @@ static struct platform_driver w5300_driver = {
.pm = &w5300_pm_ops, .pm = &w5300_pm_ops,
}, },
.probe = w5300_probe, .probe = w5300_probe,
.remove = __devexit_p(w5300_remove), .remove = w5300_remove,
}; };
module_platform_driver(w5300_driver); module_platform_driver(w5300_driver);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment