staging: qlge: Fix indentation in ql_get_mac_addr_reg
authorRylan Dmello <mail@rylan.coffee>
Thu, 30 Apr 2020 01:33:29 +0000 (21:33 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 May 2020 10:20:40 +0000 (12:20 +0200)
This has similar indentation style issues as ql_set_mac_addr_reg, so I
thought I'd re-indent this too.

Fix several checkpatch.pl warnings:

  WARNING: line over 80 characters

Signed-off-by: Rylan Dmello <mail@rylan.coffee>
Link: https://lore.kernel.org/r/b51f21b20514dc5197266a5a52d31c7b85f16741.1588209862.git.mail@rylan.coffee
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/qlge/qlge_main.c

index f2b4a54fc4c05303f7705b965f66efeabd251cf1..844c2c6df38d3409159c646500ddf7787cdaf2cc 100644 (file)
@@ -262,52 +262,50 @@ int ql_get_mac_addr_reg(struct ql_adapter *qdev, u32 type, u16 index,
 
        switch (type) {
        case MAC_ADDR_TYPE_MULTI_MAC:
-       case MAC_ADDR_TYPE_CAM_MAC:
-               {
-                       status =
-                           ql_wait_reg_rdy(qdev,
-                                           MAC_ADDR_IDX, MAC_ADDR_MW, 0);
-                       if (status)
-                               goto exit;
-                       ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */
+       case MAC_ADDR_TYPE_CAM_MAC: {
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+               if (status)
+                       goto exit;
+               ql_write32(qdev, MAC_ADDR_IDX,
+                          (offset++) | /* offset */
                                   (index << MAC_ADDR_IDX_SHIFT) | /* index */
-                                  MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */
-                       status =
-                           ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MR, 0);
-                       if (status)
-                               goto exit;
-                       *value++ = ql_read32(qdev, MAC_ADDR_DATA);
-                       status =
-                           ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+                                  MAC_ADDR_ADR | MAC_ADDR_RS |
+                                  type); /* type */
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MR, 0);
+               if (status)
+                       goto exit;
+               *value++ = ql_read32(qdev, MAC_ADDR_DATA);
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+               if (status)
+                       goto exit;
+               ql_write32(qdev, MAC_ADDR_IDX,
+                          (offset++) | /* offset */
+                                  (index << MAC_ADDR_IDX_SHIFT) | /* index */
+                                  MAC_ADDR_ADR | MAC_ADDR_RS |
+                                  type); /* type */
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MR, 0);
+               if (status)
+                       goto exit;
+               *value++ = ql_read32(qdev, MAC_ADDR_DATA);
+               if (type == MAC_ADDR_TYPE_CAM_MAC) {
+                       status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX,
+                                                MAC_ADDR_MW, 0);
                        if (status)
                                goto exit;
-                       ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */
-                                  (index << MAC_ADDR_IDX_SHIFT) | /* index */
-                                  MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */
-                       status =
-                           ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MR, 0);
+                       ql_write32(qdev, MAC_ADDR_IDX,
+                                  (offset++) | /* offset */
+                                          (index
+                                           << MAC_ADDR_IDX_SHIFT) | /* index */
+                                          MAC_ADDR_ADR |
+                                          MAC_ADDR_RS | type); /* type */
+                       status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX,
+                                                MAC_ADDR_MR, 0);
                        if (status)
                                goto exit;
                        *value++ = ql_read32(qdev, MAC_ADDR_DATA);
-                       if (type == MAC_ADDR_TYPE_CAM_MAC) {
-                               status =
-                                   ql_wait_reg_rdy(qdev,
-                                                   MAC_ADDR_IDX, MAC_ADDR_MW,
-                                                   0);
-                               if (status)
-                                       goto exit;
-                               ql_write32(qdev, MAC_ADDR_IDX, (offset++) | /* offset */
-                                          (index << MAC_ADDR_IDX_SHIFT) | /* index */
-                                          MAC_ADDR_ADR | MAC_ADDR_RS | type); /* type */
-                               status =
-                                   ql_wait_reg_rdy(qdev, MAC_ADDR_IDX,
-                                                   MAC_ADDR_MR, 0);
-                               if (status)
-                                       goto exit;
-                               *value++ = ql_read32(qdev, MAC_ADDR_DATA);
-                       }
-                       break;
                }
+               break;
+       }
        case MAC_ADDR_TYPE_VLAN:
        case MAC_ADDR_TYPE_MULTI_FLTR:
        default: