s390/qeth: re-indent qeth_check_ipa_data()

Pull one level of checking up into qeth_send_control_data_cb(), and
clean up an else-after-return. No functional change.

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_core_main.c b/drivers/s390/net/qeth_core_main.c
index 880c15647442a4e8072a1d14b37aa5d8e0de9739..954dc6c688e8176433d3d8d2f50497dbdc55b592 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -626,80 +626,64 @@ static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc,
 }
 
 static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
-               struct qeth_cmd_buffer *iob)
+                                               struct qeth_ipa_cmd *cmd)
 {
-       struct qeth_ipa_cmd *cmd = NULL;
-
        QETH_CARD_TEXT(card, 5, "chkipad");
-       if (IS_IPA(iob->data)) {
-               cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);
-               if (IS_IPA_REPLY(cmd)) {
-                       if (cmd->hdr.command != IPA_CMD_SETCCID &&
-                           cmd->hdr.command != IPA_CMD_DELCCID &&
-                           cmd->hdr.command != IPA_CMD_MODCCID &&
-                           cmd->hdr.command != IPA_CMD_SET_DIAG_ASS)
-                               qeth_issue_ipa_msg(cmd,
-                                               cmd->hdr.return_code, card);
-                       return cmd;
+
+       if (IS_IPA_REPLY(cmd)) {
+               if (cmd->hdr.command != IPA_CMD_SETCCID &&
+                   cmd->hdr.command != IPA_CMD_DELCCID &&
+                   cmd->hdr.command != IPA_CMD_MODCCID &&
+                   cmd->hdr.command != IPA_CMD_SET_DIAG_ASS)
+                       qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
+               return cmd;
+       }
+
+       /* handle unsolicited event: */
+       switch (cmd->hdr.command) {
+       case IPA_CMD_STOPLAN:
+               if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
+                       dev_err(&card->gdev->dev,
+                               "Interface %s is down because the adjacent port is no longer in reflective relay mode\n",
+                               QETH_CARD_IFNAME(card));
+                       qeth_close_dev(card);
                } else {
-                       switch (cmd->hdr.command) {
-                       case IPA_CMD_STOPLAN:
-                               if (cmd->hdr.return_code ==
-                                               IPA_RC_VEPA_TO_VEB_TRANSITION) {
-                                       dev_err(&card->gdev->dev,
-                                          "Interface %s is down because the "
-                                          "adjacent port is no longer in "
-                                          "reflective relay mode\n",
-                                          QETH_CARD_IFNAME(card));
-                                       qeth_close_dev(card);
-                               } else {
-                                       dev_warn(&card->gdev->dev,
-                                          "The link for interface %s on CHPID"
-                                          " 0x%X failed\n",
-                                          QETH_CARD_IFNAME(card),
-                                          card->info.chpid);
-                                       qeth_issue_ipa_msg(cmd,
-                                               cmd->hdr.return_code, card);
-                               }
-                               card->lan_online = 0;
-                               netif_carrier_off(card->dev);
-                               return NULL;
-                       case IPA_CMD_STARTLAN:
-                               dev_info(&card->gdev->dev,
-                                          "The link for %s on CHPID 0x%X has"
-                                          " been restored\n",
-                                          QETH_CARD_IFNAME(card),
-                                          card->info.chpid);
-                               netif_carrier_on(card->dev);
-                               card->lan_online = 1;
-                               if (card->info.hwtrap)
-                                       card->info.hwtrap = 2;
-                               qeth_schedule_recovery(card);
-                               return NULL;
-                       case IPA_CMD_SETBRIDGEPORT_IQD:
-                       case IPA_CMD_SETBRIDGEPORT_OSA:
-                       case IPA_CMD_ADDRESS_CHANGE_NOTIF:
-                               if (card->discipline->control_event_handler
-                                                               (card, cmd))
-                                       return cmd;
-                               else
-                                       return NULL;
-                       case IPA_CMD_MODCCID:
-                               return cmd;
-                       case IPA_CMD_REGISTER_LOCAL_ADDR:
-                               QETH_CARD_TEXT(card, 3, "irla");
-                               return NULL;
-                       case IPA_CMD_UNREGISTER_LOCAL_ADDR:
-                               QETH_CARD_TEXT(card, 3, "urla");
-                               return NULL;
-                       default:
-                               QETH_DBF_MESSAGE(2, "Received data is IPA "
-                                          "but not a reply!\n");
-                               break;
-                       }
+                       dev_warn(&card->gdev->dev,
+                                "The link for interface %s on CHPID 0x%X failed\n",
+                                QETH_CARD_IFNAME(card), card->info.chpid);
+                       qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
                }
+               card->lan_online = 0;
+               netif_carrier_off(card->dev);
+               return NULL;
+       case IPA_CMD_STARTLAN:
+               dev_info(&card->gdev->dev,
+                        "The link for %s on CHPID 0x%X has been restored\n",
+                        QETH_CARD_IFNAME(card), card->info.chpid);
+               netif_carrier_on(card->dev);
+               card->lan_online = 1;
+               if (card->info.hwtrap)
+                       card->info.hwtrap = 2;
+               qeth_schedule_recovery(card);
+               return NULL;
+       case IPA_CMD_SETBRIDGEPORT_IQD:
+       case IPA_CMD_SETBRIDGEPORT_OSA:
+       case IPA_CMD_ADDRESS_CHANGE_NOTIF:
+               if (card->discipline->control_event_handler(card, cmd))
+                       return cmd;
+               return NULL;
+       case IPA_CMD_MODCCID:
+               return cmd;
+       case IPA_CMD_REGISTER_LOCAL_ADDR:
+               QETH_CARD_TEXT(card, 3, "irla");
+               return NULL;
+       case IPA_CMD_UNREGISTER_LOCAL_ADDR:
+               QETH_CARD_TEXT(card, 3, "urla");
+               return NULL;
+       default:
+               QETH_DBF_MESSAGE(2, "Received data is IPA but not a reply!\n");
+               return cmd;
        }
-       return cmd;
 }
 
 void qeth_clear_ipacmd_list(struct qeth_card *card)
@@ -820,8 +804,8 @@ static void qeth_send_control_data_cb(struct qeth_card *card,
                                      struct qeth_channel *channel,
                                      struct qeth_cmd_buffer *iob)
 {
+       struct qeth_ipa_cmd *cmd = NULL;
        struct qeth_reply *reply, *r;
-       struct qeth_ipa_cmd *cmd;
        unsigned long flags;
        int keep_reply;
        int rc = 0;
@@ -839,7 +823,10 @@ static void qeth_send_control_data_cb(struct qeth_card *card,
                goto out;
        }
 
-       cmd = qeth_check_ipa_data(card, iob);
+       if (IS_IPA(iob->data)) {
+               cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);
+               cmd = qeth_check_ipa_data(card, cmd);
+       }
        if ((cmd == NULL) && (card->state != CARD_STATE_DOWN))
                goto out;
        /*in case of OSN : check if cmd is set */