diff options
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r-- | drivers/net/smc911x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 84d1feb1c179..21d823c0892c 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -1733,7 +1733,7 @@ static const struct ethtool_ops smc911x_ethtool_ops = { | |||
1733 | * This routine has a simple purpose -- make the SMC chip generate an | 1733 | * This routine has a simple purpose -- make the SMC chip generate an |
1734 | * interrupt, so an auto-detect routine can detect it, and find the IRQ, | 1734 | * interrupt, so an auto-detect routine can detect it, and find the IRQ, |
1735 | */ | 1735 | */ |
1736 | static int __init smc911x_findirq(struct net_device *dev) | 1736 | static int __devinit smc911x_findirq(struct net_device *dev) |
1737 | { | 1737 | { |
1738 | struct smc911x_local *lp = netdev_priv(dev); | 1738 | struct smc911x_local *lp = netdev_priv(dev); |
1739 | int timeout = 20; | 1739 | int timeout = 20; |
@@ -1797,7 +1797,7 @@ static int __init smc911x_findirq(struct net_device *dev) | |||
1797 | * o actually GRAB the irq. | 1797 | * o actually GRAB the irq. |
1798 | * o GRAB the region | 1798 | * o GRAB the region |
1799 | */ | 1799 | */ |
1800 | static int __init smc911x_probe(struct net_device *dev) | 1800 | static int __devinit smc911x_probe(struct net_device *dev) |
1801 | { | 1801 | { |
1802 | struct smc911x_local *lp = netdev_priv(dev); | 1802 | struct smc911x_local *lp = netdev_priv(dev); |
1803 | int i, retval; | 1803 | int i, retval; |
@@ -2046,7 +2046,7 @@ err_out: | |||
2046 | * 0 --> there is a device | 2046 | * 0 --> there is a device |
2047 | * anything else, error | 2047 | * anything else, error |
2048 | */ | 2048 | */ |
2049 | static int smc911x_drv_probe(struct platform_device *pdev) | 2049 | static int __devinit smc911x_drv_probe(struct platform_device *pdev) |
2050 | { | 2050 | { |
2051 | #ifdef SMC_DYNAMIC_BUS_CONFIG | 2051 | #ifdef SMC_DYNAMIC_BUS_CONFIG |
2052 | struct smc911x_platdata *pd = pdev->dev.platform_data; | 2052 | struct smc911x_platdata *pd = pdev->dev.platform_data; |
@@ -2122,7 +2122,7 @@ out: | |||
2122 | return ret; | 2122 | return ret; |
2123 | } | 2123 | } |
2124 | 2124 | ||
2125 | static int smc911x_drv_remove(struct platform_device *pdev) | 2125 | static int __devexit smc911x_drv_remove(struct platform_device *pdev) |
2126 | { | 2126 | { |
2127 | struct net_device *ndev = platform_get_drvdata(pdev); | 2127 | struct net_device *ndev = platform_get_drvdata(pdev); |
2128 | struct smc911x_local *lp = netdev_priv(ndev); | 2128 | struct smc911x_local *lp = netdev_priv(ndev); |
@@ -2193,7 +2193,7 @@ static int smc911x_drv_resume(struct platform_device *dev) | |||
2193 | 2193 | ||
2194 | static struct platform_driver smc911x_driver = { | 2194 | static struct platform_driver smc911x_driver = { |
2195 | .probe = smc911x_drv_probe, | 2195 | .probe = smc911x_drv_probe, |
2196 | .remove = smc911x_drv_remove, | 2196 | .remove = __devexit_p(smc911x_drv_remove), |
2197 | .suspend = smc911x_drv_suspend, | 2197 | .suspend = smc911x_drv_suspend, |
2198 | .resume = smc911x_drv_resume, | 2198 | .resume = smc911x_drv_resume, |
2199 | .driver = { | 2199 | .driver = { |