[PATCH v2 23/23] staging: qlge: Fix WARNING: Avoid multiple line dereference

From: Scott Schafer
Date: Wed Dec 11 2019 - 13:15:47 EST


Fix WARNING: Avoid multiple line dereference in qlge_main.c

Signed-off-by: Scott Schafer <schaferjscott@xxxxxxxxx>
---
drivers/staging/qlge/qlge_main.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 102da1fe9899..725db7262a9a 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -399,9 +399,8 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
* the route field to NIC core.
*/
cam_output = (CAM_OUT_ROUTE_NIC |
- (qdev->
- func << CAM_OUT_FUNC_SHIFT) |
- (0 << CAM_OUT_CQ_ID_SHIFT));
+ (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 */
@@ -3428,10 +3427,9 @@ static int ql_request_irq(struct ql_adapter *qdev)
&qdev->rx_ring[0]);
status =
request_irq(pdev->irq, qlge_isr,
- test_bit(QL_MSI_ENABLED,
- &qdev->
- flags) ? 0 : IRQF_SHARED,
- intr_context->name, &qdev->rx_ring[0]);
+ test_bit(QL_MSI_ENABLED, &qdev->flags)
+ ? 0 : IRQF_SHARED, intr_context->name,
+ &qdev->rx_ring[0]);
if (status)
goto err_irq;

--
2.20.1