leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/davinci_emac: remove __dev* attributes

Browse Source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:24:03 -05:00 committed by Greg Kroah-Hartman
parent f73d12bd29
commit e38921d4dd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/ti/davinci_emac.c
View File

@ -1850,7 +1850,7 @@ static struct emac_platform_data
* resource information from platform init and register a network device * resource information from platform init and register a network device
* and allocate resources necessary for driver to perform * and allocate resources necessary for driver to perform
*/ */
static int __devinit davinci_emac_probe(struct platform_device *pdev) static int davinci_emac_probe(struct platform_device *pdev)
{ {
int rc = 0; int rc = 0;
struct resource *res; struct resource *res;
@ -2039,7 +2039,7 @@ no_ndev:
* Called when removing the device driver. We disable clock usage and release * Called when removing the device driver. We disable clock usage and release
* the resources taken up by the driver and unregister network device * the resources taken up by the driver and unregister network device
*/ */
static int __devexit davinci_emac_remove(struct platform_device *pdev) static int davinci_emac_remove(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
@ -2107,7 +2107,7 @@ static struct platform_driver davinci_emac_driver = {
.of_match_table = of_match_ptr(davinci_emac_of_match), .of_match_table = of_match_ptr(davinci_emac_of_match),
}, },
.probe = davinci_emac_probe, .probe = davinci_emac_probe,
.remove = __devexit_p(davinci_emac_remove), .remove = davinci_emac_remove,
}; };
/** /**

6
drivers/net/ethernet/ti/davinci_mdio.c
View File

@ -310,7 +310,7 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data,
} }
static int __devinit davinci_mdio_probe(struct platform_device *pdev) static int davinci_mdio_probe(struct platform_device *pdev)
{ {
struct mdio_platform_data *pdata = pdev->dev.platform_data; struct mdio_platform_data *pdata = pdev->dev.platform_data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -416,7 +416,7 @@ bail_out:
return ret; return ret;
} }
static int __devexit davinci_mdio_remove(struct platform_device *pdev) static int davinci_mdio_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct davinci_mdio_data *data = dev_get_drvdata(dev); struct davinci_mdio_data *data = dev_get_drvdata(dev);
@ -496,7 +496,7 @@ static struct platform_driver davinci_mdio_driver = {
.of_match_table = of_match_ptr(davinci_mdio_of_mtable), .of_match_table = of_match_ptr(davinci_mdio_of_mtable),
}, },
.probe = davinci_mdio_probe, .probe = davinci_mdio_probe,
.remove = __devexit_p(davinci_mdio_remove), .remove = davinci_mdio_remove,
}; };
static int __init davinci_mdio_init(void) static int __init davinci_mdio_init(void)