提交 1e48fea4 编写于 作者: B Bill Pemberton 提交者: Greg Kroah-Hartman

smc91x: 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: NBill Pemberton <wfp5p@virginia.edu>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 369e1231
...@@ -1779,7 +1779,7 @@ static const struct net_device_ops smc_netdev_ops = { ...@@ -1779,7 +1779,7 @@ static const struct net_device_ops smc_netdev_ops = {
* I just deleted auto_irq.c, since it was never built... * I just deleted auto_irq.c, since it was never built...
* --jgarzik * --jgarzik
*/ */
static int __devinit smc_findirq(struct smc_local *lp) static int smc_findirq(struct smc_local *lp)
{ {
void __iomem *ioaddr = lp->base; void __iomem *ioaddr = lp->base;
int timeout = 20; int timeout = 20;
...@@ -1853,7 +1853,7 @@ static int __devinit smc_findirq(struct smc_local *lp) ...@@ -1853,7 +1853,7 @@ static int __devinit smc_findirq(struct smc_local *lp)
* o actually GRAB the irq. * o actually GRAB the irq.
* o GRAB the region * o GRAB the region
*/ */
static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr, static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
unsigned long irq_flags) unsigned long irq_flags)
{ {
struct smc_local *lp = netdev_priv(dev); struct smc_local *lp = netdev_priv(dev);
...@@ -2201,7 +2201,7 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device * ...@@ -2201,7 +2201,7 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
* 0 --> there is a device * 0 --> there is a device
* anything else, error * anything else, error
*/ */
static int __devinit smc_drv_probe(struct platform_device *pdev) static int smc_drv_probe(struct platform_device *pdev)
{ {
struct smc91x_platdata *pd = pdev->dev.platform_data; struct smc91x_platdata *pd = pdev->dev.platform_data;
struct smc_local *lp; struct smc_local *lp;
...@@ -2314,7 +2314,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev) ...@@ -2314,7 +2314,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit smc_drv_remove(struct platform_device *pdev) static int smc_drv_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct smc_local *lp = netdev_priv(ndev); struct smc_local *lp = netdev_priv(ndev);
...@@ -2397,7 +2397,7 @@ static struct dev_pm_ops smc_drv_pm_ops = { ...@@ -2397,7 +2397,7 @@ static struct dev_pm_ops smc_drv_pm_ops = {
static struct platform_driver smc_driver = { static struct platform_driver smc_driver = {
.probe = smc_drv_probe, .probe = smc_drv_probe,
.remove = __devexit_p(smc_drv_remove), .remove = smc_drv_remove,
.driver = { .driver = {
.name = CARDNAME, .name = CARDNAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册