net/hns3: support flow director

[dpdk.git] / drivers / net / ice / base / ice_flex_pipe.c

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 3181689..75bb870 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -131,8 +131,9 @@ static struct ice_buf_table *ice_find_buf_table(struct ice_seg *ice_seg)
 {
        struct ice_nvm_table *nvms;
 
-       nvms = (struct ice_nvm_table *)(ice_seg->device_table +
-               LE32_TO_CPU(ice_seg->device_table_count));
+       nvms = (struct ice_nvm_table *)
+               (ice_seg->device_table +
+                LE32_TO_CPU(ice_seg->device_table_count));
 
        return (_FORCE_ struct ice_buf_table *)
                (nvms->vers + LE32_TO_CPU(nvms->table_count));
@@ -1284,7 +1285,6 @@ static void ice_init_pkg_regs(struct ice_hw *hw)
 
 /**
  * ice_chk_pkg_version - check package version for compatibility with driver
- * @hw: pointer to the hardware structure
  * @pkg_ver: pointer to a version structure to check
  *
  * Check to make sure that the package about to be downloaded is compatible with
@@ -1292,18 +1292,11 @@ static void ice_init_pkg_regs(struct ice_hw *hw)
  * version must match our ICE_PKG_SUPP_VER_MAJ and ICE_PKG_SUPP_VER_MNR
  * definitions.
  */
-static enum ice_status
-ice_chk_pkg_version(struct ice_hw *hw, struct ice_pkg_ver *pkg_ver)
+static enum ice_status ice_chk_pkg_version(struct ice_pkg_ver *pkg_ver)
 {
        if (pkg_ver->major != ICE_PKG_SUPP_VER_MAJ ||
-           pkg_ver->minor != ICE_PKG_SUPP_VER_MNR) {
-               ice_info(hw, "ERROR: Incompatible package: %d.%d.%d.%d - requires package version: %d.%d.*.*\n",
-                        pkg_ver->major, pkg_ver->minor, pkg_ver->update,
-                        pkg_ver->draft, ICE_PKG_SUPP_VER_MAJ,
-                        ICE_PKG_SUPP_VER_MNR);
-
+           pkg_ver->minor != ICE_PKG_SUPP_VER_MNR)
                return ICE_ERR_NOT_SUPPORTED;
-       }
 
        return ICE_SUCCESS;
 }
@@ -1358,7 +1351,7 @@ enum ice_status ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
        /* before downloading the package, check package version for
         * compatibility with driver
         */
-       status = ice_chk_pkg_version(hw, &hw->pkg_ver);
+       status = ice_chk_pkg_version(&hw->pkg_ver);
        if (status)
                return status;
 
@@ -1384,7 +1377,7 @@ enum ice_status ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
        if (!status) {
                status = ice_get_pkg_info(hw);
                if (!status)
-                       status = ice_chk_pkg_version(hw, &hw->active_pkg_ver);
+                       status = ice_chk_pkg_version(&hw->active_pkg_ver);
        }
 
        if (!status) {
@@ -2708,7 +2701,6 @@ ice_find_prof_id_with_mask(struct ice_hw *hw, enum ice_block blk,
 
        for (i = 0; i < es->count; i++) {
                u16 off = i * es->fvw;
-               u16 j;
 
                if (memcmp(&es->t[off], fv, es->fvw * sizeof(*fv)))
                        continue;