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

cpmac: 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>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0171cdc
...@@ -1110,7 +1110,7 @@ static const struct net_device_ops cpmac_netdev_ops = { ...@@ -1110,7 +1110,7 @@ static const struct net_device_ops cpmac_netdev_ops = {
static int external_switch; static int external_switch;
static int __devinit cpmac_probe(struct platform_device *pdev) static int cpmac_probe(struct platform_device *pdev)
{ {
int rc, phy_id; int rc, phy_id;
char mdio_bus_id[MII_BUS_ID_SIZE]; char mdio_bus_id[MII_BUS_ID_SIZE];
...@@ -1204,7 +1204,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) ...@@ -1204,7 +1204,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
return rc; return rc;
} }
static int __devexit cpmac_remove(struct platform_device *pdev) static int cpmac_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
unregister_netdev(dev); unregister_netdev(dev);
...@@ -1216,10 +1216,10 @@ static struct platform_driver cpmac_driver = { ...@@ -1216,10 +1216,10 @@ static struct platform_driver cpmac_driver = {
.driver.name = "cpmac", .driver.name = "cpmac",
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.probe = cpmac_probe, .probe = cpmac_probe,
.remove = __devexit_p(cpmac_remove), .remove = cpmac_remove,
}; };
int __devinit cpmac_init(void) int cpmac_init(void)
{ {
u32 mask; u32 mask;
int i, res; int i, res;
...@@ -1290,7 +1290,7 @@ int __devinit cpmac_init(void) ...@@ -1290,7 +1290,7 @@ int __devinit cpmac_init(void)
return res; return res;
} }
void __devexit cpmac_exit(void) void cpmac_exit(void)
{ {
platform_driver_unregister(&cpmac_driver); platform_driver_unregister(&cpmac_driver);
mdiobus_unregister(cpmac_mii); mdiobus_unregister(cpmac_mii);
......
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