s390/qeth: don't special-case HW trap during suspend

It makes no difference whether we
1. manually disarm the HW trap and call the offline code with
   recovery_mode == 1, or
2. call the offline code with recovery_mode == 0, and let it disarm the
   HW trap for us.

So consolidate the two code paths in the suspend callback.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index f34fe983012c21edf495fc2762f648d9ed105c54..6380d29c10f7c75d670084a7a91b7a0fb317d9f3 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -988,12 +988,8 @@ static int qeth_l2_pm_suspend(struct ccwgroup_device *gdev)
        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
        if (gdev->state == CCWGROUP_OFFLINE)
                return 0;
-       if (card->state == CARD_STATE_UP) {
-               if (card->info.hwtrap)
-                       qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
-               __qeth_l2_set_offline(card->gdev, 1);
-       } else
-               __qeth_l2_set_offline(card->gdev, 0);
+
+       qeth_l2_set_offline(gdev);
        return 0;
 }
 

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index d424a6704811a477c9bbe4e0b1546a78a52b24fb..375ad03ea4c582ba7eae30e33545a514d2487daf 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2476,12 +2476,8 @@ static int qeth_l3_pm_suspend(struct ccwgroup_device *gdev)
        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
        if (gdev->state == CCWGROUP_OFFLINE)
                return 0;
-       if (card->state == CARD_STATE_UP) {
-               if (card->info.hwtrap)
-                       qeth_hw_trap(card, QETH_DIAGS_TRAP_DISARM);
-               __qeth_l3_set_offline(card->gdev, 1);
-       } else
-               __qeth_l3_set_offline(card->gdev, 0);
+
+       qeth_l3_set_offline(gdev);
        return 0;
 }