Commit c706df6d authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Jakub Kicinski
Browse files

net: hinic: remove the unused input parameter prod_idx in sq_prepare_ctrl() 



The input parameter prod_idx is not used in sq_prepare_ctrl(), remove it.

Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 57ac5715

drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c

+4 −7
Original line number Diff line number Diff line
@@ -472,8 +472,7 @@ int hinic_get_rq_free_wqebbs(struct hinic_rq *rq) 
	return atomic_read(&wq->delta) - 1;

}



static void sq_prepare_ctrl(struct hinic_sq_ctrl *ctrl, u16 prod_idx,

			    int nr_descs)

static void sq_prepare_ctrl(struct hinic_sq_ctrl *ctrl, int nr_descs)

{

	u32 ctrl_size, task_size, bufdesc_size;
@@ -588,18 +587,16 @@ void hinic_set_tso_inner_l4(struct hinic_sq_task *task, u32 *queue_info, 
/**

 * hinic_sq_prepare_wqe - prepare wqe before insert to the queue

 * @sq: send queue

 * @prod_idx: pi value

 * @sq_wqe: wqe to prepare

 * @sges: sges for use by the wqe for send for buf addresses

 * @nr_sges: number of sges

 **/

void hinic_sq_prepare_wqe(struct hinic_sq *sq, u16 prod_idx,

			  struct hinic_sq_wqe *sq_wqe, struct hinic_sge *sges,

			  int nr_sges)

void hinic_sq_prepare_wqe(struct hinic_sq *sq, struct hinic_sq_wqe *sq_wqe,

			  struct hinic_sge *sges, int nr_sges)

{

	int i;



	sq_prepare_ctrl(&sq_wqe->ctrl, prod_idx, nr_sges);

	sq_prepare_ctrl(&sq_wqe->ctrl, nr_sges);



	sq_prepare_task(&sq_wqe->task);

drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h

+2 −3
Original line number Diff line number Diff line
@@ -175,9 +175,8 @@ void hinic_set_tso_inner_l4(struct hinic_sq_task *task, 
			    u32 l4_len,

			    u32 offset, u32 ip_ident, u32 mss);



void hinic_sq_prepare_wqe(struct hinic_sq *sq, u16 prod_idx,

			  struct hinic_sq_wqe *wqe, struct hinic_sge *sges,

			  int nr_sges);

void hinic_sq_prepare_wqe(struct hinic_sq *sq, struct hinic_sq_wqe *wqe,

			  struct hinic_sge *sges, int nr_sges);



void hinic_sq_write_db(struct hinic_sq *sq, u16 prod_idx, unsigned int wqe_size,

		       unsigned int cos);

drivers/net/ethernet/huawei/hinic/hinic_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ netdev_tx_t hinic_lb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	}



process_sq_wqe:

	hinic_sq_prepare_wqe(txq->sq, prod_idx, sq_wqe, txq->sges, nr_sges);

	hinic_sq_prepare_wqe(txq->sq, sq_wqe, txq->sges, nr_sges);

	hinic_sq_write_wqe(txq->sq, prod_idx, sq_wqe, skb, wqe_size);



flush_skbs:
@@ -614,7 +614,7 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	}



process_sq_wqe:

	hinic_sq_prepare_wqe(txq->sq, prod_idx, sq_wqe, txq->sges, nr_sges);

	hinic_sq_prepare_wqe(txq->sq, sq_wqe, txq->sges, nr_sges);



	err = hinic_tx_offload(skb, &sq_wqe->task, &sq_wqe->ctrl.queue_info);

	if (err)