diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2019-02-28 18:59:43 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-28 12:55:26 -0800 |
| commit | 62ca98d475d1839f90d209bb47cc0192dc3db946 (patch) | |
| tree | 18b37a79e734a006fa235e53ab30d13a83892e96 /drivers/s390/net/qeth_l3_main.c | |
| parent | s390/qeth: remove driver-wide workqueue (diff) | |
| download | linux-dev-62ca98d475d1839f90d209bb47cc0192dc3db946.tar.xz linux-dev-62ca98d475d1839f90d209bb47cc0192dc3db946.zip | |
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>
Diffstat (limited to 'drivers/s390/net/qeth_l3_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index d424a6704811..375ad03ea4c5 100644 --- 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; } |