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

Commit 605cbb2c authored by Kees Cook's avatar Kees Cook Committed by Doug Ledford
Browse files

RDMA/i40iw: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Faisal Latif <faisal.latif@intel.com>
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
Cc: Doug Ledford <dledford@redhat.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: linux-rdma@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 4037c92f

drivers/infiniband/hw/i40iw/i40iw_ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -4873,6 +4873,7 @@ enum i40iw_status_code i40iw_vsi_stats_init(struct i40iw_sc_vsi *vsi, struct i40 


	vsi->pestat = info->pestat;

	vsi->pestat->hw = vsi->dev->hw;

	vsi->pestat->vsi = vsi;



	if (info->stats_initialize) {

		i40iw_hw_stats_init(vsi->pestat, fcn_id, true);

drivers/infiniband/hw/i40iw/i40iw_type.h

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ struct i40iw_vsi_pestat { 
	struct i40iw_dev_hw_stats last_read_hw_stats;

	struct i40iw_dev_hw_stats_offsets hw_stats_offsets;

	struct timer_list stats_timer;

	struct i40iw_sc_vsi *vsi;

	spinlock_t lock; /* rdma stats lock */

};

drivers/infiniband/hw/i40iw/i40iw_utils.c

+5 −5
Original line number Diff line number Diff line
@@ -1445,11 +1445,12 @@ enum i40iw_status_code i40iw_puda_get_tcpip_info(struct i40iw_puda_completion_in 
 * i40iw_hw_stats_timeout - Stats timer-handler which updates all HW stats

 * @vsi: pointer to the vsi structure

 */

static void i40iw_hw_stats_timeout(unsigned long vsi)

static void i40iw_hw_stats_timeout(struct timer_list *t)

{

	struct i40iw_sc_vsi *sc_vsi =  (struct i40iw_sc_vsi *)vsi;

	struct i40iw_vsi_pestat *pf_devstat = from_timer(pf_devstat, t,

						       stats_timer);

	struct i40iw_sc_vsi *sc_vsi = pf_devstat->vsi;

	struct i40iw_sc_dev *pf_dev = sc_vsi->dev;

	struct i40iw_vsi_pestat *pf_devstat = sc_vsi->pestat;

	struct i40iw_vsi_pestat *vf_devstat = NULL;

	u16 iw_vf_idx;

	unsigned long flags;
@@ -1480,8 +1481,7 @@ void i40iw_hw_stats_start_timer(struct i40iw_sc_vsi *vsi) 
{

	struct i40iw_vsi_pestat *devstat = vsi->pestat;



	setup_timer(&devstat->stats_timer, i40iw_hw_stats_timeout,

		    (unsigned long)vsi);

	timer_setup(&devstat->stats_timer, i40iw_hw_stats_timeout, 0);

	mod_timer(&devstat->stats_timer,

		  jiffies + msecs_to_jiffies(STATS_TIMER_DELAY));

}