diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2018-07-19 12:43:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-21 10:12:29 -0700 |
| commit | addc5ee87242a3592fdc9134ddff54c7aa372805 (patch) | |
| tree | 1a090044e420e4a6af92e10aa130cd7d5049fca7 | |
| parent | 70551dc46ffa3555a0b5f3545b0cd87ab67fd002 (diff) | |
s390/qeth: remove redundant netif_carrier_ok() checks
netif_carrier_off() does its own checking.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index f7ddd6455638..7c3b643550f6 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -653,7 +653,7 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card, cmd->hdr.return_code, card); } card->lan_online = 0; - if (card->dev && netif_carrier_ok(card->dev)) + if (card->dev) netif_carrier_off(card->dev); return NULL; case IPA_CMD_STARTLAN: diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 8ac243de7a9e..089bde458fd5 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -1163,7 +1163,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, QETH_DBF_TEXT(SETUP, 3, "setoffl"); QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *)); - if (card->dev && netif_carrier_ok(card->dev)) + if (card->dev) netif_carrier_off(card->dev); recover_flag = card->state; if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap == 2) { diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 062f62b49294..ee99af08b2c4 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2773,7 +2773,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev, QETH_DBF_TEXT(SETUP, 3, "setoffl"); QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *)); - if (card->dev && netif_carrier_ok(card->dev)) + if (card->dev) netif_carrier_off(card->dev); recover_flag = card->state; if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap == 2) { |