From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF8BC00454 for ; Wed, 11 Dec 2019 18:15:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA620222C4 for ; Wed, 11 Dec 2019 18:15:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aUxLEcZU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731367AbfLKSPn (ORCPT ); Wed, 11 Dec 2019 13:15:43 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:38624 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731306AbfLKSPl (ORCPT ); Wed, 11 Dec 2019 13:15:41 -0500 Received: by mail-yw1-f67.google.com with SMTP id 10so9308158ywv.5; Wed, 11 Dec 2019 10:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nwGdO4R8lji1D/r7NSUfswqgTgfKAYEWc+q0aQAaY34=; b=aUxLEcZUouXI6SiOx6pzGdSVCiQx8vK4DJHmtxf40D8r2b8eE/Z7eFcVMho5BCcp5X TWAopBJt6oZEaDrtyeLOmvzBUHni/LGxL7s3zooI5vp3hz+tf/sIY36AZ4ujyxRHdSM1 JW/i27mPlMCELPmiKLsbGaquGB0q4X7u10AVk6/TmUCwWN03CUXliusqyzdUQzTaTKm8 EmnzAmMs5HpqAoAL5Uh8/pasMHdghdduGWBgA4X5VWID+DVGHsYkcLwljb9EYVaya0T3 HlMFB3Nr7xLUmO3wfvrHAAHOSmPCjq6O5tjrX4lfjqHKVrh+78yKijz5Zl8ajfsy/tBN RoIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nwGdO4R8lji1D/r7NSUfswqgTgfKAYEWc+q0aQAaY34=; b=cjS3o+fYnaMo/0HZ6gcHzbwFAhuEKfvhjfVZ3grJkFdDOn+7k3TPw97mnzjwGJJyKv 7HNMCctHwGlTdnYWIaPCNUXdZSRaMe+IjhySH1C+luA7fXydRgDxgjvQL2eAiAG6aEI9 Q4cbBkvjMFICCArd7hes4aBrFvLtbYU1KA7Xk8HXU1P7I4+GNRhj41XbglhZUpNxhRgf wgHSV4KEa7l6P2+rpC1//I1BtsdxAZBU2b1lFD9caDf1Sstu+xv05USFCeb3azxSB4Vd L7KZj6L/s+jsGakYpGjqqpVvP0t9T8/zfXvEIyWa+2Var18hSa50oRZg5ibkIOyBEDdL LFBg== X-Gm-Message-State: APjAAAVrb4ZFSPs+N+1bnFbfNmRfTXWoEn2frzLmaRF9+bokvVfiotDC PNyqDCQyoKTzdvl1lnY0N+07JDdv2/BVww== X-Google-Smtp-Source: APXvYqyozxGB2X1nuGDB7dAEJrbGUelIJWseYKoI5+DIGHJRwfsZF4g4z3Za9/kKACyVGBgBVB3tMw== X-Received: by 2002:a0d:d2c2:: with SMTP id u185mr875765ywd.211.1576088139917; Wed, 11 Dec 2019 10:15:39 -0800 (PST) Received: from karen ([2604:2d80:d68a:cf00:a4bc:8e08:1748:387f]) by smtp.gmail.com with ESMTPSA id f134sm1304186ywb.68.2019.12.11.10.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:15:39 -0800 (PST) From: Scott Schafer To: gregkh@linuxfoundation.org Cc: Scott Schafer , Manish Chopra , GR-Linux-NIC-Dev@marvell.com, netdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 23/23] staging: qlge: Fix WARNING: Avoid multiple line dereference Date: Wed, 11 Dec 2019 12:12:52 -0600 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix WARNING: Avoid multiple line dereference in qlge_main.c Signed-off-by: Scott Schafer --- 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