1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 05c91ee6921e..ae4983a5127d 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2031,7 +2031,7 @@ static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr,
         }
 
         /* Grab the IRQ */
-        retval = request_irq(dev->irq, &smc_interrupt, irq_flags, dev->name, dev);
+        retval = request_irq(dev->irq, smc_interrupt, irq_flags, dev->name, dev);
         if (retval)
                 goto err_out;
 
@@ -2283,7 +2283,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
 
         ndev->irq = ires->start;
 
-        if (ires->flags & IRQF_TRIGGER_MASK)
+        if (irq_flags == -1 || ires->flags & IRQF_TRIGGER_MASK)
                 irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
         ret = smc_request_attrib(pdev, ndev);
@@ -2365,9 +2365,10 @@ static int __devexit smc_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
-static int smc_drv_suspend(struct platform_device *dev, pm_message_t state)
+static int smc_drv_suspend(struct device *dev)
 {
-        struct net_device *ndev = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
 
         if (ndev) {
                 if (netif_running(ndev)) {
@@ -2379,9 +2380,10 @@ static int smc_drv_suspend(struct platform_device *dev, pm_message_t state)
         return 0;
 }
 
-static int smc_drv_resume(struct platform_device *dev)
+static int smc_drv_resume(struct device *dev)
 {
-        struct net_device *ndev = platform_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
 
         if (ndev) {
                 struct smc_local *lp = netdev_priv(ndev);
@@ -2397,14 +2399,18 @@ static int smc_drv_resume(struct platform_device *dev)
         return 0;
 }
 
+static struct dev_pm_ops smc_drv_pm_ops = {
+        .suspend        = smc_drv_suspend,
+        .resume         = smc_drv_resume,
+};
+
 static struct platform_driver smc_driver = {
         .probe          = smc_drv_probe,
         .remove         = __devexit_p(smc_drv_remove),
-        .suspend        = smc_drv_suspend,
-        .resume         = smc_drv_resume,
         .driver         = {
                 .name   = CARDNAME,
                 .owner  = THIS_MODULE,
+                .pm     = &smc_drv_pm_ops,
         },
 };