dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

net/cadence: 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>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:57 -05:00 committed by Greg Kroah-Hartman
parent 093d369d4e
commit 37a5b3d531
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/cadence/at91_ether.c
View File

@ -456,7 +456,7 @@ err_free_dev:
return res;
}
static int __devexit at91ether_remove(struct platform_device *pdev)
static int at91ether_remove(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
struct macb *lp = netdev_priv(dev);
@ -509,7 +509,7 @@ static int at91ether_resume(struct platform_device *pdev)
#endif
static struct platform_driver at91ether_driver = {
.remove = __devexit_p(at91ether_remove),
.remove = at91ether_remove,
.suspend = at91ether_suspend,
.resume = at91ether_resume,
.driver = {

8
drivers/net/ethernet/cadence/macb.c
View File

@ -1470,7 +1470,7 @@ static const struct of_device_id macb_dt_ids[] = {
MODULE_DEVICE_TABLE(of, macb_dt_ids);
static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)
static int macb_get_phy_mode_dt(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
@ -1480,7 +1480,7 @@ static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)
return -ENODEV;
}
static int __devinit macb_get_hwaddr_dt(struct macb *bp)
static int macb_get_hwaddr_dt(struct macb *bp)
{
struct device_node *np = bp->pdev->dev.of_node;
if (np) {
@ -1494,11 +1494,11 @@ static int __devinit macb_get_hwaddr_dt(struct macb *bp)
return -ENODEV;
}
#else
static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)
static int macb_get_phy_mode_dt(struct platform_device *pdev)
{
return -ENODEV;
}
static int __devinit macb_get_hwaddr_dt(struct macb *bp)
static int macb_get_hwaddr_dt(struct macb *bp)
{
return -ENODEV;
}