aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_l2_main.c
diff options
context:
space:
mode:
authorJulian Wiedmann <jwi@linux.ibm.com>2018-09-26 12:29:12 -0400
committerDavid S. Miller <davem@davemloft.net>2018-09-26 12:56:07 -0400
commit6585ac4e5d74e8e8310c87c18782812faada13a8 (patch)
tree5063faed44f4ce6b9dc4c01a6ae6d701fc3ee58f /drivers/s390/net/qeth_l2_main.c
parent8d908eb045bb1ad8a842910360938a204a203617 (diff)
s390/qeth: remove various redundant code
1. tracing iob->rc makes no sense when it hasn't been modified by the callback, 2. the qeth_dbf_list is declared with LIST_HEAD, which also initializes the list, 3. the ccwgroup core only calls the thaw/restore callbacks if the gdev is online, so we don't have to check for it again. 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_l2_main.c')
-rw-r--r--drivers/s390/net/qeth_l2_main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 02566af7e23d..ed475b4ddd3e 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1146,9 +1146,6 @@ static int qeth_l2_pm_resume(struct ccwgroup_device *gdev)
1146 struct qeth_card *card = dev_get_drvdata(&gdev->dev); 1146 struct qeth_card *card = dev_get_drvdata(&gdev->dev);
1147 int rc = 0; 1147 int rc = 0;
1148 1148
1149 if (gdev->state == CCWGROUP_OFFLINE)
1150 goto out;
1151
1152 if (card->state == CARD_STATE_RECOVER) { 1149 if (card->state == CARD_STATE_RECOVER) {
1153 rc = __qeth_l2_set_online(card->gdev, 1); 1150 rc = __qeth_l2_set_online(card->gdev, 1);
1154 if (rc) { 1151 if (rc) {
@@ -1158,7 +1155,7 @@ static int qeth_l2_pm_resume(struct ccwgroup_device *gdev)
1158 } 1155 }
1159 } else 1156 } else
1160 rc = __qeth_l2_set_online(card->gdev, 0); 1157 rc = __qeth_l2_set_online(card->gdev, 0);
1161out: 1158
1162 qeth_set_allowed_threads(card, 0xffffffff, 0); 1159 qeth_set_allowed_threads(card, 0xffffffff, 0);
1163 netif_device_attach(card->dev); 1160 netif_device_attach(card->dev);
1164 if (rc) 1161 if (rc)