2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 8d34ac60d906..06883309916d 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -291,12 +291,12 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
 /*
 * Suspend the IrDA interface.
 */
-static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
+static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
 {
        struct net_device *dev = dev_get_drvdata(_dev);
        struct sa1100_irda *si;
-        if (!dev || level != SUSPEND_DISABLE)
+        if (!dev)
                return 0;
        si = dev->priv;
@@ -316,12 +316,12 @@ static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 leve
 /*
 * Resume the IrDA interface.
 */
-static int sa1100_irda_resume(struct device *_dev, u32 level)
+static int sa1100_irda_resume(struct device *_dev)
 {
        struct net_device *dev = dev_get_drvdata(_dev);
        struct sa1100_irda *si;
-        if (!dev || level != RESUME_ENABLE)
+        if (!dev)
                return 0;
        si = dev->priv;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index dd89bda1f131..bbac720cca63 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -213,8 +213,8 @@ static int  smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
 /* Power Management */
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level);
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state);
-static int smsc_ircc_resume(struct device *dev, u32 level);
+static int smsc_ircc_resume(struct device *dev);
 static struct device_driver smsc_ircc_driver = {
        .name           = SMSC_IRCC2_DRIVER_NAME,
@@ -1646,13 +1646,13 @@ static int smsc_ircc_net_close(struct net_device *dev)
        return 0;
 }
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
 {
        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
        IRDA_MESSAGE("%s, Suspending\n", driver_name);
-        if (level == SUSPEND_DISABLE && !self->io.suspended) {
+        if (!self->io.suspended) {
                smsc_ircc_net_close(self->netdev);
                self->io.suspended = 1;
        }
@@ -1660,11 +1660,11 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)
        return 0;
 }
-static int smsc_ircc_resume(struct device *dev, u32 level)
+static int smsc_ircc_resume(struct device *dev)
 {
        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
-        if (level == RESUME_ENABLE && self->io.suspended) {
+        if (self->io.suspended) {
                smsc_ircc_net_open(self->netdev);
                self->io.suspended = 0;

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 8d34ac60d906..06883309916d 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c
@@ -291,12 +291,12 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
291	/*	291	/*
292	* Suspend the IrDA interface.	292	* Suspend the IrDA interface.
293	*/	293	*/
294	static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 level)	294	static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
295	{	295	{
296	struct net_device *dev = dev_get_drvdata(_dev);	296	struct net_device *dev = dev_get_drvdata(_dev);
297	struct sa1100_irda *si;	297	struct sa1100_irda *si;
298		298
299	if (!dev \|\| level != SUSPEND_DISABLE)	299	if (!dev)
300	return 0;	300	return 0;
301		301
302	si = dev->priv;	302	si = dev->priv;
@@ -316,12 +316,12 @@ static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 leve
316	/*	316	/*
317	* Resume the IrDA interface.	317	* Resume the IrDA interface.
318	*/	318	*/
319	static int sa1100_irda_resume(struct device *_dev, u32 level)	319	static int sa1100_irda_resume(struct device *_dev)
320	{	320	{
321	struct net_device *dev = dev_get_drvdata(_dev);	321	struct net_device *dev = dev_get_drvdata(_dev);
322	struct sa1100_irda *si;	322	struct sa1100_irda *si;
323		323
324	if (!dev \|\| level != RESUME_ENABLE)	324	if (!dev)
325	return 0;	325	return 0;
326		326
327	si = dev->priv;	327	si = dev->priv;


diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index dd89bda1f131..bbac720cca63 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c
@@ -213,8 +213,8 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
213		213
214	/* Power Management */	214	/* Power Management */
215		215
216	static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level);	216	static int smsc_ircc_suspend(struct device *dev, pm_message_t state);
217	static int smsc_ircc_resume(struct device *dev, u32 level);	217	static int smsc_ircc_resume(struct device *dev);
218		218
219	static struct device_driver smsc_ircc_driver = {	219	static struct device_driver smsc_ircc_driver = {
220	.name = SMSC_IRCC2_DRIVER_NAME,	220	.name = SMSC_IRCC2_DRIVER_NAME,
@@ -1646,13 +1646,13 @@ static int smsc_ircc_net_close(struct net_device *dev)
1646	return 0;	1646	return 0;
1647	}	1647	}
1648		1648
1649	static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)	1649	static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
1650	{	1650	{
1651	struct smsc_ircc_cb *self = dev_get_drvdata(dev);	1651	struct smsc_ircc_cb *self = dev_get_drvdata(dev);
1652		1652
1653	IRDA_MESSAGE("%s, Suspending\n", driver_name);	1653	IRDA_MESSAGE("%s, Suspending\n", driver_name);
1654		1654
1655	if (level == SUSPEND_DISABLE && !self->io.suspended) {	1655	if (!self->io.suspended) {
1656	smsc_ircc_net_close(self->netdev);	1656	smsc_ircc_net_close(self->netdev);
1657	self->io.suspended = 1;	1657	self->io.suspended = 1;
1658	}	1658	}
@@ -1660,11 +1660,11 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)
1660	return 0;	1660	return 0;
1661	}	1661	}
1662		1662
1663	static int smsc_ircc_resume(struct device *dev, u32 level)	1663	static int smsc_ircc_resume(struct device *dev)
1664	{	1664	{
1665	struct smsc_ircc_cb *self = dev_get_drvdata(dev);	1665	struct smsc_ircc_cb *self = dev_get_drvdata(dev);
1666		1666
1667	if (level == RESUME_ENABLE && self->io.suspended) {	1667	if (self->io.suspended) {
1668		1668
1669	smsc_ircc_net_open(self->netdev);	1669	smsc_ircc_net_open(self->netdev);
1670	self->io.suspended = 0;	1670	self->io.suspended = 0;