[ARM] 3066/1: Fix PXA irda driver suspend/resume functions

Patch from Richard Purdie

Update the PXA irda driver to match the recent platform device
suspend/resume level changes.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index aef80f5e7c9cff71da8ba2121458e9b0277ba41f..b886b07412a67c95f8e64b5203af7ad92722121e 100644 (file)
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -704,15 +704,12 @@ static int pxa_irda_stop(struct net_device *dev)
        return 0;
 }
 
-static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
 {
        struct net_device *dev = dev_get_drvdata(_dev);
        struct pxa_irda *si;
 
-       if (!dev || level != SUSPEND_DISABLE)
-               return 0;
-
-       if (netif_running(dev)) {
+       if (dev && netif_running(dev)) {
                si = netdev_priv(dev);
                netif_device_detach(dev);
                pxa_irda_shutdown(si);
@@ -721,15 +718,12 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
        return 0;
 }
 
-static int pxa_irda_resume(struct device *_dev, u32 level)
+static int pxa_irda_resume(struct device *_dev)
 {
        struct net_device *dev = dev_get_drvdata(_dev);
        struct pxa_irda *si;
 
-       if (!dev || level != RESUME_ENABLE)
-               return 0;
-
-       if (netif_running(dev)) {
+       if (dev && netif_running(dev)) {
                si = netdev_priv(dev);
                pxa_irda_startup(si);
                netif_device_attach(dev);