Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3134371pxk; Mon, 21 Sep 2020 06:12:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCHHPCWRxyFVqZzt2Q1tGmVi+6Tfou8KxHAhrC/PD/5O2d9bKK0oeoM6S+NKnc2E5TGZJY X-Received: by 2002:a17:906:bc47:: with SMTP id s7mr51929104ejv.354.1600693960997; Mon, 21 Sep 2020 06:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600693960; cv=none; d=google.com; s=arc-20160816; b=l1b32FOK/Ph2GOVkMWo3XOMEZdC/8Lv8vF4cVAAG44c5e2rfb1+ZY1zfhm0rxy+dY7 h0FG5s8xxcTkf2Wacm2e3M/SybXv5lyRxRb2TcdHC4CZK2jv1xg+kjuvA6anD6PwgGSl 5I3rue9utubJTTR2rb6mJQBhRgjvXotEPCYWaOMMhn21lfYzXqAaaQbX2qE/FvEq3WAa AbNBQ91TuVst4hYjz00RfEldrdbV5mR09CtQuplIpqMaQO/jczcBEHvhyuvnGNAK5Upq bek+jBVHA7jW4DOggr5J1e9GFnJiDD6yJv9wJQv6+uS3XCCzm0hmAOb9y2X/Sjit9L++ UGMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=SYUOIW/E6jszLHmfOjJP2E6MiEfg/9P8z9WR6eWeBLM=; b=W3tX3bmNkdAkZ5ZPMBt9H4f93XORhAUfRztm3XgAfhNlHn8fJEaxwyAmA0Hl4HGLEz C/YN32b97Hcbyo4/bmjCmg7PF0I8LPR6meyBcjmQeQ8JP1cSA0SPl6Z3xnqq1uvyrf1N Kz5uBZ08stfD+NSAS+aLtM3C/f0u2sYgkyMyR7/vbA0qonQ1m7JBakebP63HMazdYGQH 9wdbADCVdK1+azQlEwLRTnljY1ii7lRxx+mnqPEJkhsnm7VlJwMXytIZ4P/bIrLGtlE/ QNQkLiMnsEoNHDzGxvnetaThiryLiMIw3TajGJzKXJ7H4WJn52miIIIvRA2q4luuWyTw mizQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w7si7899902ejf.3.2020.09.21.06.12.16; Mon, 21 Sep 2020 06:12:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726471AbgIUNKg (ORCPT + 99 others); Mon, 21 Sep 2020 09:10:36 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:13762 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727363AbgIUNKd (ORCPT ); Mon, 21 Sep 2020 09:10:33 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 9147AA84E4BC26210675; Mon, 21 Sep 2020 21:10:29 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Mon, 21 Sep 2020 21:10:22 +0800 From: Qinglang Miao To: Shahed Shaikh , Manish Chopra , CC: "David S. Miller" , Jakub Kicinski , , , Qinglang Miao Subject: [PATCH -next] net: qlcnic: simplify the return expression of qlcnic_83xx_shutdown Date: Mon, 21 Sep 2020 21:10:46 +0800 Message-ID: <20200921131046.92480-1-miaoqinglang@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify the return expression. Signed-off-by: Qinglang Miao --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 81a688dd0..d8882d0b6 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -3811,7 +3811,6 @@ static int qlcnic_83xx_shutdown(struct pci_dev *pdev) { struct qlcnic_adapter *adapter = pci_get_drvdata(pdev); struct net_device *netdev = adapter->netdev; - int retval; netif_device_detach(netdev); qlcnic_cancel_idc_work(adapter); @@ -3822,11 +3821,7 @@ static int qlcnic_83xx_shutdown(struct pci_dev *pdev) qlcnic_83xx_disable_mbx_intr(adapter); cancel_delayed_work_sync(&adapter->idc_aen_work); - retval = pci_save_state(pdev); - if (retval) - return retval; - - return 0; + return pci_save_state(pdev); } static int qlcnic_83xx_resume(struct qlcnic_adapter *adapter) -- 2.23.0