IB/ipoib: Convert timers to use timer_setup()
authorKees Cook <keescook@chromium.org>
Thu, 5 Oct 2017 00:45:54 +0000 (17:45 -0700)
committerDoug Ledford <dledford@redhat.com>
Mon, 9 Oct 2017 16:19:41 +0000 (12:19 -0400)
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: Doug Ledford <dledford@redhat.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Alex Vesker <valex@mellanox.com>
Cc: Erez Shitrit <erezsh@mellanox.com>
Cc: Zhu Yanjun <yanjun.zhu@oracle.com>
Cc: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Yuval Shaia <yuval.shaia@oracle.com>
Cc: linux-rdma@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/ipoib/ipoib.h
drivers/infiniband/ulp/ipoib/ipoib_ib.c
drivers/infiniband/ulp/ipoib/ipoib_main.c

index 4a5c7a07a6315719910169e01bf3e7c73871a722..7cc2b755413d25e8d17589e1079b9ff179068c17 100644 (file)
@@ -500,7 +500,7 @@ void ipoib_mark_paths_invalid(struct net_device *dev);
 void ipoib_flush_paths(struct net_device *dev);
 struct ipoib_dev_priv *ipoib_intf_alloc(struct ib_device *hca, u8 port,
                                        const char *format);
-void ipoib_ib_tx_timer_func(unsigned long ctx);
+void ipoib_ib_tx_timer_func(struct timer_list *t);
 void ipoib_ib_dev_flush_light(struct work_struct *work);
 void ipoib_ib_dev_flush_normal(struct work_struct *work);
 void ipoib_ib_dev_flush_heavy(struct work_struct *work);
index 6cd61638b44142029b85d0f057b8d04c6b2138c6..918930a0bc70e525848bd9d5e0781c7d8d49a55a 100644 (file)
@@ -821,9 +821,11 @@ int ipoib_ib_dev_stop(struct net_device *dev)
        return 0;
 }
 
-void ipoib_ib_tx_timer_func(unsigned long ctx)
+void ipoib_ib_tx_timer_func(struct timer_list *t)
 {
-       drain_tx_cq((struct net_device *)ctx);
+       struct ipoib_dev_priv *priv = from_timer(priv, t, poll_timer);
+
+       drain_tx_cq(priv->dev);
 }
 
 int ipoib_ib_dev_open_default(struct net_device *dev)
index dcc77014018db037cd24540dfe8ddf06d9b70fef..77c1b7adbb403eb34a0ff40c04d71df09d263261 100644 (file)
@@ -1666,8 +1666,7 @@ static int ipoib_dev_init_default(struct net_device *dev)
        priv->dev->dev_addr[2] = (priv->qp->qp_num >>  8) & 0xff;
        priv->dev->dev_addr[3] = (priv->qp->qp_num) & 0xff;
 
-       setup_timer(&priv->poll_timer, ipoib_ib_tx_timer_func,
-                   (unsigned long)dev);
+       timer_setup(&priv->poll_timer, ipoib_ib_tx_timer_func, 0);
 
        return 0;