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

Commit 79d9df56 authored by Geliang Tang's avatar Geliang Tang Committed by Doug Ledford
Browse files

IB/nes: use setup_timer 



Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 96ff2c11

drivers/infiniband/hw/nes/nes_hw.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1849,9 +1849,8 @@ int nes_init_nic_qp(struct nes_device *nesdev, struct net_device *netdev) 
		wqe_count -= counter;

		wqe_count -= counter;

		nes_write32(nesdev->regs+NES_WQE_ALLOC, (counter << 24) | nesvnic->nic.qp_id);

		nes_write32(nesdev->regs+NES_WQE_ALLOC, (counter << 24) | nesvnic->nic.qp_id);

	} while (wqe_count);

	} while (wqe_count);

	init_timer(&nesvnic->rq_wqes_timer);

	setup_timer(&nesvnic->rq_wqes_timer, nes_rq_wqes_timeout,

	nesvnic->rq_wqes_timer.function = nes_rq_wqes_timeout;

		    (unsigned long)nesvnic);

	nesvnic->rq_wqes_timer.data = (unsigned long)nesvnic;

	nes_debug(NES_DBG_INIT, "NAPI support Enabled\n");

	nes_debug(NES_DBG_INIT, "NAPI support Enabled\n");

	if (nesdev->nesadapter->et_use_adaptive_rx_coalesce)

	if (nesdev->nesadapter->et_use_adaptive_rx_coalesce)

	{

	{

drivers/infiniband/hw/nes/nes_mgt.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1040,9 +1040,8 @@ int nes_init_mgt_qp(struct nes_device *nesdev, struct net_device *netdev, struct 
			mgtvnic->mgt.rx_skb[counter] = skb;

			mgtvnic->mgt.rx_skb[counter] = skb;

		}

		}





		init_timer(&mgtvnic->rq_wqes_timer);

		setup_timer(&mgtvnic->rq_wqes_timer, nes_mgt_rq_wqes_timeout,

		mgtvnic->rq_wqes_timer.function = nes_mgt_rq_wqes_timeout;

			    (unsigned long)mgtvnic);

		mgtvnic->rq_wqes_timer.data = (unsigned long)mgtvnic;





		wqe_count = NES_MGT_WQ_COUNT - 1;

		wqe_count = NES_MGT_WQ_COUNT - 1;

		mgtvnic->mgt.rq_head = wqe_count;

		mgtvnic->mgt.rq_head = wqe_count;

drivers/infiniband/hw/nes/nes_verbs.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1308,9 +1308,8 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, 
	init_completion(&nesqp->rq_drained);

	init_completion(&nesqp->rq_drained);





	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);

	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);

	init_timer(&nesqp->terminate_timer);

	setup_timer(&nesqp->terminate_timer, nes_terminate_timeout,

	nesqp->terminate_timer.function = nes_terminate_timeout;

		    (unsigned long)nesqp);

	nesqp->terminate_timer.data = (unsigned long)nesqp;





	/* update the QP table */

	/* update the QP table */

	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;

	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;