[PATCH net-next 10/14] mlxsw: reg: Move all trap groups under the same enum

[Ido Schimmel]

From: Ido Schimmel <ido...@mellanox.com>

After the previous patch the split is no longer necessary and all the
trap groups can be moved under the same enum.

Signed-off-by: Ido Schimmel <ido...@mellanox.com>
Reviewed-by: Jiri Pirko <j...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/reg.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h 
b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index fd5e18b71114..586a2f37fd12 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -5548,18 +5548,14 @@ enum mlxsw_reg_htgt_trap_group {
        MLXSW_REG_HTGT_TRAP_GROUP_SP_PKT_SAMPLE,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_FLOW_LOGGING,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_FID_MISS,
-
-       __MLXSW_REG_HTGT_TRAP_GROUP_MAX,
-       MLXSW_REG_HTGT_TRAP_GROUP_MAX = __MLXSW_REG_HTGT_TRAP_GROUP_MAX - 1
-};
-
-enum mlxsw_reg_htgt_discard_trap_group {
-       MLXSW_REG_HTGT_DISCARD_TRAP_GROUP_BASE = MLXSW_REG_HTGT_TRAP_GROUP_MAX,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_DUMMY,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_L2_DISCARDS,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_L3_DISCARDS,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_TUNNEL_DISCARDS,
        MLXSW_REG_HTGT_TRAP_GROUP_SP_ACL_DISCARDS,
+
+       __MLXSW_REG_HTGT_TRAP_GROUP_MAX,
+       MLXSW_REG_HTGT_TRAP_GROUP_MAX = __MLXSW_REG_HTGT_TRAP_GROUP_MAX - 1
 };
 
 /* reg_htgt_trap_group
-- 
2.26.2