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

Commit 96ff2c11 authored by Geliang Tang's avatar Geliang Tang Committed by Doug Ledford
Browse files

IB/i40iw: 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 1e072934

drivers/infiniband/hw/i40iw/i40iw_cm.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -3184,9 +3184,8 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev) 
	INIT_LIST_HEAD(&cm_core->connected_nodes);

	INIT_LIST_HEAD(&cm_core->connected_nodes);

	INIT_LIST_HEAD(&cm_core->listen_nodes);

	INIT_LIST_HEAD(&cm_core->listen_nodes);





	init_timer(&cm_core->tcp_timer);

	setup_timer(&cm_core->tcp_timer, i40iw_cm_timer_tick,

	cm_core->tcp_timer.function = i40iw_cm_timer_tick;

		    (unsigned long)cm_core);

	cm_core->tcp_timer.data = (unsigned long)cm_core;





	spin_lock_init(&cm_core->ht_lock);

	spin_lock_init(&cm_core->ht_lock);

	spin_lock_init(&cm_core->listen_list_lock);

	spin_lock_init(&cm_core->listen_list_lock);

drivers/infiniband/hw/i40iw/i40iw_utils.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -844,10 +844,9 @@ void i40iw_terminate_start_timer(struct i40iw_sc_qp *qp) 




	iwqp = (struct i40iw_qp *)qp->back_qp;

	iwqp = (struct i40iw_qp *)qp->back_qp;

	i40iw_add_ref(&iwqp->ibqp);

	i40iw_add_ref(&iwqp->ibqp);

	init_timer(&iwqp->terminate_timer);

	setup_timer(&iwqp->terminate_timer, i40iw_terminate_timeout,

	iwqp->terminate_timer.function = i40iw_terminate_timeout;

		    (unsigned long)iwqp);

	iwqp->terminate_timer.expires = jiffies + HZ;

	iwqp->terminate_timer.expires = jiffies + HZ;

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

	add_timer(&iwqp->terminate_timer);

	add_timer(&iwqp->terminate_timer);

}

}
@@ -1436,9 +1435,8 @@ void i40iw_hw_stats_start_timer(struct i40iw_sc_vsi *vsi) 
{

{

	struct i40iw_vsi_pestat *devstat = vsi->pestat;

	struct i40iw_vsi_pestat *devstat = vsi->pestat;





	init_timer(&devstat->stats_timer);

	setup_timer(&devstat->stats_timer, i40iw_hw_stats_timeout,

	devstat->stats_timer.function = i40iw_hw_stats_timeout;

		    (unsigned long)vsi);

	devstat->stats_timer.data = (unsigned long)vsi;

	mod_timer(&devstat->stats_timer,

	mod_timer(&devstat->stats_timer,

		  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));

		  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));

}

}