Skip to content

Commit

Permalink
cpmac: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent b0171cd commit f57ae66
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ethernet/ti/cpmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ static const struct net_device_ops cpmac_netdev_ops = {

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;
char mdio_bus_id[MII_BUS_ID_SIZE];
Expand Down Expand Up @@ -1204,7 +1204,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
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);
unregister_netdev(dev);
Expand All @@ -1216,10 +1216,10 @@ static struct platform_driver cpmac_driver = {
.driver.name = "cpmac",
.driver.owner = THIS_MODULE,
.probe = cpmac_probe,
.remove = __devexit_p(cpmac_remove),
.remove = cpmac_remove,
};

int __devinit cpmac_init(void)
int cpmac_init(void)
{
u32 mask;
int i, res;
Expand Down Expand Up @@ -1290,7 +1290,7 @@ int __devinit cpmac_init(void)
return res;
}

void __devexit cpmac_exit(void)
void cpmac_exit(void)
{
platform_driver_unregister(&cpmac_driver);
mdiobus_unregister(cpmac_mii);
Expand Down

0 comments on commit f57ae66

Please sign in to comment.