s390/qeth: de-indent else after return
authorKittipon Meesompop <kmeesomp@linux.vnet.ibm.com>
Thu, 26 Apr 2018 07:42:16 +0000 (09:42 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Apr 2018 17:38:48 +0000 (13:38 -0400)
Trivial cleanup, in preparation for a subsequent patch.

Signed-off-by: Kittipon Meesompop <kmeesomp@linux.vnet.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l3_main.c

index 64f27de079ca6d32e7494464ad79a87f117c1f70..0e8ed8787fd3ebe0aadba37a786181d99d0067ee 100644 (file)
@@ -2533,28 +2533,27 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
                    (card->info.link_type == QETH_LINK_TYPE_HSTR)) {
                        pr_info("qeth_l3: ignoring TR device\n");
                        return -ENODEV;
-               } else {
-                       card->dev = alloc_etherdev(0);
-                       if (!card->dev)
-                               return -ENODEV;
-                       card->dev->netdev_ops = &qeth_l3_osa_netdev_ops;
-
-                       /*IPv6 address autoconfiguration stuff*/
-                       qeth_l3_get_unique_id(card);
-                       if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
-                               card->dev->dev_id = card->info.unique_id &
-                                                        0xffff;
-
-                       card->dev->hw_features |= NETIF_F_SG;
-                       card->dev->vlan_features |= NETIF_F_SG;
-
-                       if (!card->info.guestlan) {
-                               card->dev->features |= NETIF_F_SG;
-                               card->dev->hw_features |= NETIF_F_TSO |
-                                       NETIF_F_RXCSUM | NETIF_F_IP_CSUM;
-                               card->dev->vlan_features |= NETIF_F_TSO |
-                                       NETIF_F_RXCSUM | NETIF_F_IP_CSUM;
-                       }
+               }
+
+               card->dev = alloc_etherdev(0);
+               if (!card->dev)
+                       return -ENODEV;
+               card->dev->netdev_ops = &qeth_l3_osa_netdev_ops;
+
+               /*IPv6 address autoconfiguration stuff*/
+               qeth_l3_get_unique_id(card);
+               if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
+                       card->dev->dev_id = card->info.unique_id & 0xffff;
+
+               card->dev->hw_features |= NETIF_F_SG;
+               card->dev->vlan_features |= NETIF_F_SG;
+
+               if (!card->info.guestlan) {
+                       card->dev->features |= NETIF_F_SG;
+                       card->dev->hw_features |= NETIF_F_TSO |
+                               NETIF_F_RXCSUM | NETIF_F_IP_CSUM;
+                       card->dev->vlan_features |= NETIF_F_TSO |
+                               NETIF_F_RXCSUM | NETIF_F_IP_CSUM;
                }
        } else if (card->info.type == QETH_CARD_TYPE_IQD) {
                card->dev = alloc_netdev(0, "hsi%d", NET_NAME_UNKNOWN,