Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp352160pxj; Tue, 18 May 2021 05:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyF3w46cedwTXXX+si7sJlgYeA04IUjLnClvvJaaRRxSYYJJXGOhD+1wr45MjSLehTp6gIA X-Received: by 2002:a17:906:ad9a:: with SMTP id la26mr5766928ejb.122.1621339318624; Tue, 18 May 2021 05:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621339318; cv=none; d=google.com; s=arc-20160816; b=dqew/BdfP9V1SWeS0dWTLjqvaRJTd9X9MSPBm561Qs45D6GR4oQhXy+AZvNehBz9tB cguzlDRcJIrkCOJDJZLBKbtpIR8F71AUwKkxsDqiOm/2KHqzvktj4g/JYa+OXSJJa5YD xreMPsI9bGIfHXtx+UCrpqxffqArOqaTCHjf4mGFyW+FCTcDFQX/G0DyNtPRMPxmX7E4 WUZ5GmltSnTT9hFhHbwmbqwpRtSrS8NsolceNszcPKrcqhSlgi0APfaNA3fZ0Zl07wTc EFlhybi38eHeu/qeIVPt3Hct8/bfdVBkMGIXF2ZzJIVo75W5LIuNK+BAbemQobQN4QO9 8tCg== 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=dfvOA1LjvwjQ5/RqbLnGIHa3hZHjI2tL9ujmiJaGqYrleV2EabPWN36SaGGW16QZvi Jr21i1x/zgiFsLGUgZkSFq8YaAN66pKAd4y2Q04wPNq5Z55RP00jBjVjk743DrpQNBZw 4ecI1gXLJh8Z7DxNc0AVmtPCzaizjTJbw4TTVl/v9Hu+yoe267UWoyf14okrw/2o8zQT O13ooqy//MXWdwJxcBT/I/db3vl38W+kBFnZ4/VBv9EUDY0kpksqKC3tungWnPtViLZd k+dqPp42l71XRW7rMW/hAhSfwpakUZavGLjGS86qZdysBUeTFHJ6dia5BvGMdVTpIM9f y6DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PbccOHJr; 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 a42si20616646edf.188.2021.05.18.05.01.29; Tue, 18 May 2021 05:01:58 -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=PbccOHJr; 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 S244360AbhEQP1W (ORCPT + 99 others); Mon, 17 May 2021 11:27:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:39776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243125AbhEQPNP (ORCPT ); Mon, 17 May 2021 11:13:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A71E061261; Mon, 17 May 2021 14:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261897; bh=RCxLgN7/gkXsKhym5ThqqgbVTx9xWZPHnifZLnamMSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PbccOHJrkUv8QIgZseGWFkgAgVmm81AB9ivPhsoCKrqwjRv6NLWZukmgzKGC0CxGk nLu8peQwDAKgSjqQ30qxUA76F7d1/5Ct9P/yQIvB0pdQ+czyCUvIQqKXir0mLYVoeO MRP+gJkoU/u8Mbm9HsEfVL3r+k/ncxSeG+fgh2fk= 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.10 082/289] iavf: remove duplicate free resources calls Date: Mon, 17 May 2021 16:00:07 +0200 Message-Id: <20210517140307.949046377@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140305.140529752@linuxfoundation.org> References: <20210517140305.140529752@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