Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp176771pxj; Tue, 18 May 2021 00:22:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/U0qqFGmtcU/nHzV3ti6yubS8NJa0Rl58rGeEv2nYjqu/Ik0ZL2TA+c4uAi73PjBYZx1O X-Received: by 2002:a17:906:1701:: with SMTP id c1mr4560457eje.425.1621322545883; Tue, 18 May 2021 00:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621322545; cv=none; d=google.com; s=arc-20160816; b=CDre19Gpqj1ESItF9CEwNcdlvK1fbtuLa0dxnpkZ3eyXDk+cqONo8cRocICk4d0AvO rB96oRjvr1zLeRawfRPceeJAo1dyuaJHqhcgga1uAjrz1OIM9ZjTfRJtpcM/6MpEFqWN zE7yVdH1zEiSXGxq8XDfnATyH5dBXf4Ptb1aTIaQncXDoaVNQl545Djz0Id3YpZv2R91 lJQbvL/R1z+O94IGXugmCYDej5C8a4LU6CIVDRt9++d9e89BSDG2cl2WI1MuSfD/twb0 25hXk8AO0hm92EZMjI6Yj3oGBbSmHPeIhttXYhpSNlM9jojtchVWlchBUqxf5cPO+rP8 tesQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=opfiMkbAzFGJ/E1za07PNakHiKyBERpOywPNJbycUyg=; b=xbey/qmhJvYlFhvZd+v6QKTwLhLA9XGM+cLnLk2auWhzqprSzEDOHoeSBRg6Fk3DND LWrL5O9ZL9hpq45btzXdWqz7uMNhikkQ3aZgaArTdwXA78EkenBVDLgC90nE8aHq8eus g0+1YyYMbd7JkpmzUkjZih5FqwIa4BEwyC5koc+E1HUuivLPWL9qaDWA34xBA1fFSlPr tNVKa8OF7t1TbWWvU73jn8Niom5jo5qsNhBNbNkaJ1IvoO1s3VCQE8JtuvfcCApfpxgJ wLg3agSRF8O52MZltINhqZi2vcNE+VwoRTEXCoXHbML8zJbx//IrRph3qoMEQdUvyDV2 EHlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WjlxyKYJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k22si1256007ejc.431.2021.05.18.00.22.02; Tue, 18 May 2021 00:22:25 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WjlxyKYJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242357AbhEQOzJ (ORCPT + 99 others); Mon, 17 May 2021 10:55:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240997AbhEQOrJ (ORCPT ); Mon, 17 May 2021 10:47:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3191C6145A; Mon, 17 May 2021 14:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261318; bh=RCxLgN7/gkXsKhym5ThqqgbVTx9xWZPHnifZLnamMSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WjlxyKYJHCOuFiJ3FF4D9q5K0b7a2NfMc5v+Gp5VlJpBylp3lAYKp7aSnNpLgSrLu 7pBo/wYQ4BpLLxZgUFWTlkS4B2Ij7XerjMC+/iLwW/IlUubwW8p2+TanzSkrxNturL 6jQpQr1G+rka2tFNW1aOUj49az9gmzCpfJQUZBeo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Assmann , Tony Nguyen , Sasha Levin Subject: [PATCH 5.11 101/329] iavf: remove duplicate free resources calls Date: Mon, 17 May 2021 16:00:12 +0200 Message-Id: <20210517140305.542678764@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.043055203@linuxfoundation.org> References: <20210517140302.043055203@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Assmann [ Upstream commit 1a0e880b028f97478dc689e2900b312741d0d772 ] Both iavf_free_all_tx_resources() and iavf_free_all_rx_resources() have already been called in the very same function. Remove the duplicate calls. Signed-off-by: Stefan Assmann Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/iavf/iavf_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index dc5b3c06d1e0..ebd08543791b 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -3899,8 +3899,6 @@ static void iavf_remove(struct pci_dev *pdev) iounmap(hw->hw_addr); pci_release_regions(pdev); - iavf_free_all_tx_resources(adapter); - iavf_free_all_rx_resources(adapter); iavf_free_queues(adapter); kfree(adapter->vf_res); spin_lock_bh(&adapter->mac_vlan_list_lock); -- 2.30.2