Merge tag 'driver-core-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_dcbnl.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index ebee52a8361aa7f7102683c4d62dbc4571ed1a71..8705cffc747ffbaeb08186fde904c5f30fbab438 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -275,10 +275,10 @@ static int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets
        memcpy(priv->dcbx.tc_tsa, ets->tc_tsa, sizeof(ets->tc_tsa));
 
        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-               mlx5e_dbg(HW, priv, "%s: prio_%d <=> tc_%d\n",
-                         __func__, i, ets->prio_tc[i]);
-               mlx5e_dbg(HW, priv, "%s: tc_%d <=> tx_bw_%d%%, group_%d\n",
-                         __func__, i, tc_tx_bw[i], tc_group[i]);
+               netdev_dbg(priv->netdev, "%s: prio_%d <=> tc_%d\n",
+                          __func__, i, ets->prio_tc[i]);
+               netdev_dbg(priv->netdev, "%s: tc_%d <=> tx_bw_%d%%, group_%d\n",
+                          __func__, i, tc_tx_bw[i], tc_group[i]);
        }
 
        return err;
@@ -399,9 +399,9 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev,
        }
 
        if (!ret) {
-               mlx5e_dbg(HW, priv,
-                         "%s: PFC per priority bit mask: 0x%x\n",
-                         __func__, pfc->pfc_en);
+               netdev_dbg(dev,
+                          "%s: PFC per priority bit mask: 0x%x\n",
+                          __func__, pfc->pfc_en);
        }
        return ret;
 }
@@ -611,8 +611,8 @@ static int mlx5e_dcbnl_ieee_setmaxrate(struct net_device *netdev,
        }
 
        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-               mlx5e_dbg(HW, priv, "%s: tc_%d <=> max_bw %d Gbps\n",
-                         __func__, i, max_bw_value[i]);
+               netdev_dbg(netdev, "%s: tc_%d <=> max_bw %d Gbps\n",
+                          __func__, i, max_bw_value[i]);
        }
 
        return mlx5_modify_port_ets_rate_limit(mdev, max_bw_value, max_bw_unit);
@@ -640,10 +640,10 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev)
                ets.tc_rx_bw[i] = cee_cfg->pg_bw_pct[i];
                ets.tc_tsa[i]   = IEEE_8021QAZ_TSA_ETS;
                ets.prio_tc[i]  = cee_cfg->prio_to_pg_map[i];
-               mlx5e_dbg(HW, priv,
-                         "%s: Priority group %d: tx_bw %d, rx_bw %d, prio_tc %d\n",
-                         __func__, i, ets.tc_tx_bw[i], ets.tc_rx_bw[i],
-                         ets.prio_tc[i]);
+               netdev_dbg(netdev,
+                          "%s: Priority group %d: tx_bw %d, rx_bw %d, prio_tc %d\n",
+                          __func__, i, ets.tc_tx_bw[i], ets.tc_rx_bw[i],
+                          ets.prio_tc[i]);
        }
 
        err = mlx5e_dbcnl_validate_ets(netdev, &ets, true);