RDMA/mlx5: Delete duplicated mlx5_ptys_width enum

Combine two same enums to avoid duplication.

Signed-off-by: Aharon Landau <aharonl@mellanox.com>
Reviewed-by: Michael Guralnik <michaelgur@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 631ca36..2dbacf0 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1179,32 +1179,24 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
        return 0;
 }
 
-enum mlx5_ib_width {
-       MLX5_IB_WIDTH_1X        = 1 << 0,
-       MLX5_IB_WIDTH_2X        = 1 << 1,
-       MLX5_IB_WIDTH_4X        = 1 << 2,
-       MLX5_IB_WIDTH_8X        = 1 << 3,
-       MLX5_IB_WIDTH_12X       = 1 << 4
-};
-
 static void translate_active_width(struct ib_device *ibdev, u16 active_width,
                                   u8 *ib_width)
 {
        struct mlx5_ib_dev *dev = to_mdev(ibdev);
 
-       if (active_width & MLX5_IB_WIDTH_1X)
+       if (active_width & MLX5_PTYS_WIDTH_1X)
                *ib_width = IB_WIDTH_1X;
-       else if (active_width & MLX5_IB_WIDTH_2X)
+       else if (active_width & MLX5_PTYS_WIDTH_2X)
                *ib_width = IB_WIDTH_2X;
-       else if (active_width & MLX5_IB_WIDTH_4X)
+       else if (active_width & MLX5_PTYS_WIDTH_4X)
                *ib_width = IB_WIDTH_4X;
-       else if (active_width & MLX5_IB_WIDTH_8X)
+       else if (active_width & MLX5_PTYS_WIDTH_8X)
                *ib_width = IB_WIDTH_8X;
-       else if (active_width & MLX5_IB_WIDTH_12X)
+       else if (active_width & MLX5_PTYS_WIDTH_12X)
                *ib_width = IB_WIDTH_12X;
        else {
                mlx5_ib_dbg(dev, "Invalid active_width %d, setting width to default value: 4x\n",
-                           (int)active_width);
+                           active_width);
                *ib_width = IB_WIDTH_4X;
        }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
index 17f5be8..cac8f08 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
@@ -130,14 +130,6 @@ static int mlx5i_flash_device(struct net_device *netdev,
        return mlx5e_ethtool_flash_device(priv, flash);
 }
 
-enum mlx5_ptys_width {
-       MLX5_PTYS_WIDTH_1X      = 1 << 0,
-       MLX5_PTYS_WIDTH_2X      = 1 << 1,
-       MLX5_PTYS_WIDTH_4X      = 1 << 2,
-       MLX5_PTYS_WIDTH_8X      = 1 << 3,
-       MLX5_PTYS_WIDTH_12X     = 1 << 4,
-};
-
 static inline int mlx5_ptys_width_enum_to_int(enum mlx5_ptys_width width)
 {
        switch (width) {

diff --git a/include/linux/mlx5/port.h b/include/linux/mlx5/port.h
index 4d33ae0..23edd2d 100644 (file)
--- a/include/linux/mlx5/port.h
+++ b/include/linux/mlx5/port.h
@@ -125,6 +125,14 @@ enum mlx5e_connector_type {
        MLX5E_CONNECTOR_TYPE_NUMBER,
 };
 
+enum mlx5_ptys_width {
+       MLX5_PTYS_WIDTH_1X      = 1 << 0,
+       MLX5_PTYS_WIDTH_2X      = 1 << 1,
+       MLX5_PTYS_WIDTH_4X      = 1 << 2,
+       MLX5_PTYS_WIDTH_8X      = 1 << 3,
+       MLX5_PTYS_WIDTH_12X     = 1 << 4,
+};
+
 #define MLX5E_PROT_MASK(link_mode) (1 << link_mode)
 #define MLX5_GET_ETH_PROTO(reg, out, ext, field)       \
        (ext ? MLX5_GET(reg, out, ext_##field) :        \