Merge by Hand

[linux-2.6] / drivers / net / irda / pxaficp_ir.c

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 9571145c20904ad72f2526ee082bae8c5dd2e043..e1aa9910503bf08bf844f8327f26a5419eb9b939 100644 (file)
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -705,15 +705,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);
@@ -722,15 +719,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);