staging: qlge: Fix indentation in ql_set_mac_addr_reg

Based on Joe Perches' feedback, fix the indentation throughout
ql_set_mac_addr_reg. This helps fix several "line over 80 characters"
warnings along with the original "multiple line dereference" warning.

Fix checkpatch.pl warnings:

  WARNING: Avoid multiple line dereference - prefer 'qdev->func'
  WARNING: line over 80 characters

Signed-off-by: Rylan Dmello <mail@rylan.coffee>
Link: https://lore.kernel.org/r/299f2cb3b7d4efa30b44d4d1defbcd5f54bd7eaf.1588209862.git.mail@rylan.coffee
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index d7e4dfafc1a3beaecc03d98e516eeee14a839b29..29610618c7c06dc786d126244726d3e8faf7244c 100644 (file)
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -329,100 +329,89 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
        int status = 0;
 
        switch (type) {
-       case MAC_ADDR_TYPE_MULTI_MAC:
-               {
-                       u32 upper = (addr[0] << 8) | addr[1];
-                       u32 lower = (addr[2] << 24) | (addr[3] << 16) |
-                                       (addr[4] << 8) | (addr[5]);
+       case MAC_ADDR_TYPE_MULTI_MAC: {
+               u32 upper = (addr[0] << 8) | addr[1];
+               u32 lower = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |
+                           (addr[5]);
 
-                       status =
-                               ql_wait_reg_rdy(qdev,
-                                               MAC_ADDR_IDX, MAC_ADDR_MW, 0);
-                       if (status)
-                               goto exit;
-                       ql_write32(qdev, MAC_ADDR_IDX, (offset++) |
-                               (index << MAC_ADDR_IDX_SHIFT) |
-                               type | MAC_ADDR_E);
-                       ql_write32(qdev, MAC_ADDR_DATA, lower);
-                       status =
-                               ql_wait_reg_rdy(qdev,
-                                               MAC_ADDR_IDX, MAC_ADDR_MW, 0);
-                       if (status)
-                               goto exit;
-                       ql_write32(qdev, MAC_ADDR_IDX, (offset++) |
-                               (index << MAC_ADDR_IDX_SHIFT) |
-                               type | MAC_ADDR_E);
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+               if (status)
+                       goto exit;
+               ql_write32(qdev, MAC_ADDR_IDX,
+                          (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |
+                                  MAC_ADDR_E);
+               ql_write32(qdev, MAC_ADDR_DATA, lower);
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+               if (status)
+                       goto exit;
+               ql_write32(qdev, MAC_ADDR_IDX,
+                          (offset++) | (index << MAC_ADDR_IDX_SHIFT) | type |
+                                  MAC_ADDR_E);
 
-                       ql_write32(qdev, MAC_ADDR_DATA, upper);
-                       status =
-                               ql_wait_reg_rdy(qdev,
-                                               MAC_ADDR_IDX, MAC_ADDR_MW, 0);
-                       if (status)
-                               goto exit;
-                       break;
-               }
-       case MAC_ADDR_TYPE_CAM_MAC:
-               {
-                       u32 cam_output;
-                       u32 upper = (addr[0] << 8) | addr[1];
-                       u32 lower =
-                           (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |
+               ql_write32(qdev, MAC_ADDR_DATA, upper);
+               status = ql_wait_reg_rdy(qdev, MAC_ADDR_IDX, MAC_ADDR_MW, 0);
+               if (status)
+                       goto exit;
+               break;
+       }
+       case MAC_ADDR_TYPE_CAM_MAC: {
+               u32 cam_output;
+               u32 upper = (addr[0] << 8) | addr[1];
+               u32 lower = (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) |
                            (addr[5]);
-                       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 */
+               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 */
-                                  type);       /* type */
-                       ql_write32(qdev, MAC_ADDR_DATA, lower);
-                       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 */
+                                  type); /* type */
+               ql_write32(qdev, MAC_ADDR_DATA, lower);
+               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 */
-                                  type);       /* type */
-                       ql_write32(qdev, MAC_ADDR_DATA, upper);
-                       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 */
-                                  type);       /* type */
-                       /* This field should also include the queue id
-                        * and possibly the function id.  Right now we hardcode
-                        * the route field to NIC core.
-                        */
-                       cam_output = (CAM_OUT_ROUTE_NIC |
-                                     (qdev->
-                                      func << CAM_OUT_FUNC_SHIFT) |
-                                       (0 << CAM_OUT_CQ_ID_SHIFT));
-                       if (qdev->ndev->features & NETIF_F_HW_VLAN_CTAG_RX)
-                               cam_output |= CAM_OUT_RV;
-                       /* route to NIC core */
-                       ql_write32(qdev, MAC_ADDR_DATA, cam_output);
-                       break;
-               }
-       case MAC_ADDR_TYPE_VLAN:
-               {
-                       u32 enable_bit = *((u32 *) &addr[0]);
-                       /* For VLAN, the addr actually holds a bit that
-                        * either enables or disables the vlan id we are
-                        * addressing. It's either MAC_ADDR_E on or off.
-                        * That's bit-27 we're talking about.
-                        */
-                       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 */
-                                  type |       /* type */
-                                  enable_bit); /* enable/disable */
-                       break;
-               }
+                                  type); /* type */
+               ql_write32(qdev, MAC_ADDR_DATA, upper);
+               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 */
+                                  type); /* type */
+               /* This field should also include the queue id
+                * and possibly the function id.  Right now we hardcode
+                * the route field to NIC core.
+                */
+               cam_output = (CAM_OUT_ROUTE_NIC |
+                             (qdev->func << CAM_OUT_FUNC_SHIFT) |
+                             (0 << CAM_OUT_CQ_ID_SHIFT));
+               if (qdev->ndev->features & NETIF_F_HW_VLAN_CTAG_RX)
+                       cam_output |= CAM_OUT_RV;
+               /* route to NIC core */
+               ql_write32(qdev, MAC_ADDR_DATA, cam_output);
+               break;
+       }
+       case MAC_ADDR_TYPE_VLAN: {
+               u32 enable_bit = *((u32 *)&addr[0]);
+               /* For VLAN, the addr actually holds a bit that
+                * either enables or disables the vlan id we are
+                * addressing. It's either MAC_ADDR_E on or off.
+                * That's bit-27 we're talking about.
+                */
+               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 */
+                                  type | /* type */
+                                  enable_bit); /* enable/disable */
+               break;
+       }
        case MAC_ADDR_TYPE_MULTI_FLTR:
        default:
                netif_crit(qdev, ifup, qdev->ndev,