Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5c04f6 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove MLX5E_TEST_BIT macro 



MLX5E_TEST_BIT macro is the same as the already existent test_bit,
remove it and replace all usages.

Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent bfbe2057

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −2
Original line number Diff line number Diff line
@@ -288,8 +288,6 @@ enum { 
	MLX5E_RQ_STATE_AM,

};



#define MLX5E_TEST_BIT(state, nr) (state & BIT(nr))



struct mlx5e_cq {

	/* data path - accessed per cqe */

	struct mlx5_cqwq           wq;

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+5 −5
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq) 
	struct mlx5_wq_ll *wq = &rq->wq;

	int err;



	if (unlikely(!MLX5E_TEST_BIT(rq->state, MLX5E_RQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))

		return false;



	if (mlx5_wq_ll_is_full(wq))
@@ -508,7 +508,7 @@ static void mlx5e_poll_ico_cq(struct mlx5e_cq *cq, struct mlx5e_rq *rq) 
	struct mlx5e_icosq *sq = container_of(cq, struct mlx5e_icosq, cq);

	struct mlx5_cqe64 *cqe;



	if (unlikely(!MLX5E_TEST_BIT(sq->state, MLX5E_SQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))

		return;



	cqe = mlx5_cqwq_get_cqe(&cq->wq);
@@ -525,7 +525,7 @@ bool mlx5e_post_rx_mpwqes(struct mlx5e_rq *rq) 
{

	struct mlx5_wq_ll *wq = &rq->wq;



	if (unlikely(!MLX5E_TEST_BIT(rq->state, MLX5E_RQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))

		return false;



	mlx5e_poll_ico_cq(&rq->channel->icosq.cq, rq);
@@ -1132,7 +1132,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) 
	struct mlx5_cqe64 *cqe;

	int work_done = 0;



	if (unlikely(!MLX5E_TEST_BIT(rq->state, MLX5E_RQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))

		return 0;



	if (cq->decmprs_left)
@@ -1185,7 +1185,7 @@ bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq) 


	sq = container_of(cq, struct mlx5e_xdpsq, cq);



	if (unlikely(!MLX5E_TEST_BIT(sq->state, MLX5E_SQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))

		return false;



	cqe = mlx5_cqwq_get_cqe(&cq->wq);

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 


	sq = container_of(cq, struct mlx5e_txqsq, cq);



	if (unlikely(!MLX5E_TEST_BIT(sq->state, MLX5E_SQ_STATE_ENABLED)))

	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))

		return false;



	cqe = mlx5_cqwq_get_cqe(&cq->wq);

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq) 
{

	struct net_dim_sample dim_sample;



	if (unlikely(!MLX5E_TEST_BIT(sq->state, MLX5E_SQ_STATE_AM)))

	if (unlikely(!test_bit(MLX5E_SQ_STATE_AM, &sq->state)))

		return;



	net_dim_sample(sq->cq.event_ctr, sq->stats.packets, sq->stats.bytes,
@@ -60,7 +60,7 @@ static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq) 
{

	struct net_dim_sample dim_sample;



	if (unlikely(!MLX5E_TEST_BIT(rq->state, MLX5E_RQ_STATE_AM)))

	if (unlikely(!test_bit(MLX5E_RQ_STATE_AM, &rq->state)))

		return;



	net_dim_sample(rq->cq.event_ctr, rq->stats.packets, rq->stats.bytes,