net: vxge: Convert timers to use timer_setup()
Subsystems (2)
PATCH 1/1 net: vxge: 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 Jon Mason <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Miroslav Lichvar <[email protected]>
Cc Jarod Wilson <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc stephen hemminger <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.
--- drivers/net/ethernet/neterion/vxge/vxge-main.c | 12 ++++++------ drivers/net/ethernet/neterion/vxge/vxge-main.h | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/net/ethernet/neterion/vxge/vxge-main.c +6 -6
@@ -2597,9 +2597,9 @@ static int vxge_add_isr(struct vxgedev *vdev)return VXGE_HW_OK ; } -static void vxge_poll_vp_reset (unsigned long data) +static void vxge_poll_vp_reset (struct timer_list *t) { -struct vxgedev *vdev = (struct vxgedev *)data; +struct vxgedev *vdev =from_timer (vdev, t, vp_reset_timer);int i, j =0 ;for (i =0 ; i < vdev->no_of_vpath; i++) {
@@ -2616,9 +2616,9 @@ static void vxge_poll_vp_reset(unsigned long data)mod_timer (&vdev->vp_reset_timer, jiffies +HZ /2 ); } -static void vxge_poll_vp_lockup (unsigned long data) +static void vxge_poll_vp_lockup (struct timer_list *t) { -struct vxgedev *vdev = (struct vxgedev *)data; +struct vxgedev *vdev =from_timer (vdev, t, vp_lockup_timer);enum vxge_hw_status status =VXGE_HW_OK ;struct vxge_vpath *vpath;struct vxge_ring *ring;
@@ -2858,12 +2858,12 @@ static int vxge_open(struct net_device *dev) vdev->config.rx_pause_enable);if (vdev->vp_reset_timer.function ==NULL ) -vxge_os_timer (&vdev->vp_reset_timer, vxge_poll_vp_reset, vdev, +vxge_os_timer (&vdev->vp_reset_timer, vxge_poll_vp_reset,HZ /2 );/* There is no need to check for RxD leak and RxD lookup on Titan1A */ if (vdev->titan1 && vdev->vp_lockup_timer.function ==NULL ) -vxge_os_timer (&vdev->vp_lockup_timer, vxge_poll_vp_lockup, vdev, +vxge_os_timer (&vdev->vp_lockup_timer, vxge_poll_vp_lockup,HZ /2 );set_bit (__VXGE_STATE_CARD_UP, &vdev->state);
drivers/net/ethernet/neterion/vxge/vxge-main.h +3 -5
@@ -417,12 +417,10 @@ struct vxge_tx_priv { module_param(p, int, 0)static inline -void vxge_os_timer (struct timer_list *timer,void (*func)(unsigned long data), -struct vxgedev *vdev,unsigned long timeout) +void vxge_os_timer (struct timer_list *timer,void (*func)(struct timer_list *), +unsigned long timeout) { -init_timer (timer); - timer->function = func; - timer->data = (unsigned long )vdev; +timer_setup (timer, func,0 );mod_timer (timer, jiffies + timeout); }
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security