|
@@ -1779,7 +1779,7 @@ static const struct net_device_ops smc_netdev_ops = {
|
|
|
* I just deleted auto_irq.c, since it was never built...
|
|
|
* --jgarzik
|
|
|
*/
|
|
|
-static int __devinit smc_findirq(struct smc_local *lp)
|
|
|
+static int smc_findirq(struct smc_local *lp)
|
|
|
{
|
|
|
void __iomem *ioaddr = lp->base;
|
|
|
int timeout = 20;
|
|
@@ -1853,7 +1853,7 @@ static int __devinit smc_findirq(struct smc_local *lp)
|
|
|
* o actually GRAB the irq.
|
|
|
* 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)
|
|
|
{
|
|
|
struct smc_local *lp = netdev_priv(dev);
|
|
@@ -2201,7 +2201,7 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
|
|
|
* 0 --> there is a device
|
|
|
* 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 smc_local *lp;
|
|
@@ -2314,7 +2314,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
|
|
|
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 smc_local *lp = netdev_priv(ndev);
|
|
@@ -2397,7 +2397,7 @@ static struct dev_pm_ops smc_drv_pm_ops = {
|
|
|
|
|
|
static struct platform_driver smc_driver = {
|
|
|
.probe = smc_drv_probe,
|
|
|
- .remove = __devexit_p(smc_drv_remove),
|
|
|
+ .remove = smc_drv_remove,
|
|
|
.driver = {
|
|
|
.name = CARDNAME,
|
|
|
.owner = THIS_MODULE,
|