Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ca98d4 authored Feb 28, 2019 by Julian Wiedmann Committed by David S. Miller Feb 28, 2019

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>

parent dcef5cad

drivers/s390/net/qeth_l2_main.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/s390/net/qeth_l3_main.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}