From patchwork Thu Oct 19 17:32:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 13429571 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C063335A7 for ; Thu, 19 Oct 2023 17:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hIhDcgaF" Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9852FCF for ; Thu, 19 Oct 2023 10:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697736755; x=1729272755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LmIWwKcsHMK2uHG9SRLAnhRp80bltX+X+1vzzutioUg=; b=hIhDcgaF4t4/ugKcSE0YjQ+NG3IAX9JCwAqzgsWCMW7+dnCR1XyxEufg QXAryYZy4R47iKWZQh3uvLLiqznKfNM8g4th0QLc1fvW9bH2rsAqZuEmX +TA2KJng6rugCH1hZTlfATCUsn1He2j07NYtXWX52kteSMAXNO9QvsTqq SxR1AijZW7EYGJR2TqVNL1OQwhTbTGG/wuLM9yWRC2C3Vu/wLhfr/FuG/ dCeawezJeVidrfIVePbyqiYoslb9EsUvQiYupy1A2JnmwlOVcQTAvqS0K kzD7ZSeGGtPrxXXaAew8WvIQsY8xzzLaMJz1UVUJFQiDhDmQJetR1ktqb A==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="389183673" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="389183673" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 10:32:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="760722671" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="760722671" Received: from jekeller-desk.amr.corp.intel.com (HELO jekeller-desk.jekeller.internal) ([10.166.241.1]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 10:32:33 -0700 From: Jacob Keller To: netdev@vger.kernel.org, David Miller , Jakub Kicinski Cc: Przemek Kitszel , Maciej Fijalkowski , Jesse Brandeburg , Leon Romanovsky , Jacob Keller Subject: [PATCH net-next 01/11] ice: remove unused ice_flow_entry fields Date: Thu, 19 Oct 2023 10:32:17 -0700 Message-ID: <20231019173227.3175575-2-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019173227.3175575-1-jacob.e.keller@intel.com> References: <20231019173227.3175575-1-jacob.e.keller@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Przemek Kitszel Remove ::entry and ::entry_sz fields of &ice_flow_entry, as they were never set. Suggested-by: Maciej Fijalkowski Reviewed-by: Jesse Brandeburg Signed-off-by: Przemek Kitszel Reviewed-by: Leon Romanovsky Signed-off-by: Jacob Keller --- drivers/net/ethernet/intel/ice/ice_flow.c | 5 +---- drivers/net/ethernet/intel/ice/ice_flow.h | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c index 85cca572c22a..fb8b925aaf8b 100644 --- a/drivers/net/ethernet/intel/ice/ice_flow.c +++ b/drivers/net/ethernet/intel/ice/ice_flow.c @@ -1318,7 +1318,6 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk, list_del(&entry->l_entry); - devm_kfree(ice_hw_to_dev(hw), entry->entry); devm_kfree(ice_hw_to_dev(hw), entry); return 0; @@ -1645,10 +1644,8 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id, *entry_h = ICE_FLOW_ENTRY_HNDL(e); out: - if (status && e) { - devm_kfree(ice_hw_to_dev(hw), e->entry); + if (status) devm_kfree(ice_hw_to_dev(hw), e); - } return status; } diff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h index b465d27d9b80..96923ef0a5a8 100644 --- a/drivers/net/ethernet/intel/ice/ice_flow.h +++ b/drivers/net/ethernet/intel/ice/ice_flow.h @@ -350,11 +350,8 @@ struct ice_flow_entry { u64 id; struct ice_flow_prof *prof; - /* Flow entry's content */ - void *entry; enum ice_flow_priority priority; u16 vsi_handle; - u16 entry_sz; }; #define ICE_FLOW_ENTRY_HNDL(e) ((u64)(uintptr_t)e)