RDMA/nes: 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. A pointer from nesadapter back to
nesdev was added.

Cc: Faisal Latif <faisal.latif@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: Kees Cook <keescook@chromium.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 37331e2fdc5f..1dc0527e5a05 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -740,11 +740,11 @@ int nes_arp_table(struct nes_device *nesdev, u32 ip_addr, u8 *mac_addr, u32 acti
 /**
  * nes_mh_fix
  */
-void nes_mh_fix(unsigned long parm)
+void nes_mh_fix(struct timer_list *t)
 {
+        struct nes_adapter *nesadapter = from_timer(nesadapter, t, mh_timer);
+        struct nes_device *nesdev = nesadapter->nesdev;
         unsigned long flags;
-        struct nes_device *nesdev = (struct nes_device *)parm;
-        struct nes_adapter *nesadapter = nesdev->nesadapter;
         struct nes_vnic *nesvnic;
         u32 used_chunks_tx;
         u32 temp_used_chunks_tx;
@@ -881,11 +881,10 @@ no_mh_work:
 /**
  * nes_clc
  */
-void nes_clc(unsigned long parm)
+void nes_clc(struct timer_list *t)
 {
+        struct nes_adapter *nesadapter = from_timer(nesadapter, t, lc_timer);
         unsigned long flags;
-        struct nes_device *nesdev = (struct nes_device *)parm;
-        struct nes_adapter *nesadapter = nesdev->nesadapter;
 
         spin_lock_irqsave(&nesadapter->phy_lock, flags);
     nesadapter->link_interrupt_count[0] = 0;