From: Doug Ledford Date: Wed, 18 Oct 2017 17:12:09 +0000 (-0400) Subject: Merge branch 'timer_setup' into for-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=894b82c427d069a773e1d1417fe30bd31aa18801;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'timer_setup' into for-next Conflicts: drivers/infiniband/hw/cxgb4/cm.c drivers/infiniband/hw/qib/qib_driver.c drivers/infiniband/hw/qib/qib_mad.c There were minor fixups needed in these files. Just minor context diffs due to patches from independent sources touching the same basic area. Signed-off-by: Doug Ledford --- 894b82c427d069a773e1d1417fe30bd31aa18801 diff --cc drivers/infiniband/hw/cxgb4/cm.c index 78e2916f9c78,fc981e68f0b2..7eb8a85e4d42 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@@ -2102,9 -2098,8 +2100,8 @@@ static int c4iw_reconnect(struct c4iw_e int iptype; __u8 *ra; - pr_debug("%s qp %p cm_id %p\n", __func__, ep->com.qp, ep->com.cm_id); - c4iw_init_wr_wait(&ep->com.wr_wait); + pr_debug("qp %p cm_id %p\n", ep->com.qp, ep->com.cm_id); - init_timer(&ep->timer); + c4iw_init_wr_wait(ep->com.wr_waitp); /* When MPA revision is different on nodes, the node with MPA_rev=2 * tries to reconnect with MPA_rev 1 for the same EP through @@@ -2578,10 -2573,10 +2575,10 @@@ static int pass_accept_req(struct c4iw_ child_ep->dst = dst; child_ep->hwtid = hwtid; - pr_debug("%s tx_chan %u smac_idx %u rss_qid %u\n", __func__, + pr_debug("tx_chan %u smac_idx %u rss_qid %u\n", child_ep->tx_chan, child_ep->smac_idx, child_ep->rss_qid); - init_timer(&child_ep->timer); + timer_setup(&child_ep->timer, ep_timeout, 0); cxgb4_insert_tid(t, child_ep, hwtid, child_ep->com.local_addr.ss_family); insert_ep_tid(child_ep); diff --cc drivers/infiniband/hw/cxgb4/qp.c index 56655a000121,c306def0501c..57b23e33eb8b --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@@ -1929,9 -1935,9 +1929,8 @@@ struct ib_qp *c4iw_create_qp(struct ib_ qhp->ucontext = ucontext; } qhp->ibqp.qp_num = qhp->wq.sq.qid; - init_timer(&(qhp->timer)); INIT_LIST_HEAD(&qhp->db_fc_entry); - pr_debug("%s sq id %u size %u memsize %zu num_entries %u rq id %u size %u memsize %zu num_entries %u\n", - __func__, + pr_debug("sq id %u size %u memsize %zu num_entries %u rq id %u size %u memsize %zu num_entries %u\n", qhp->wq.sq.qid, qhp->wq.sq.size, qhp->wq.sq.memsize, attrs->cap.max_send_wr, qhp->wq.rq.qid, qhp->wq.rq.size, qhp->wq.rq.memsize, attrs->cap.max_recv_wr); diff --cc drivers/infiniband/hw/i40iw/i40iw_cm.c index f5cfb224e153,af7526a275b8..4bd54b367532 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@@ -1196,9 -1196,10 +1196,9 @@@ static void i40iw_cm_timer_tick(struct struct list_head *list_core_temp; struct i40iw_sc_vsi *vsi; struct list_head *list_node; - struct i40iw_cm_core *cm_core = (struct i40iw_cm_core *)pass; + struct i40iw_cm_core *cm_core = from_timer(cm_core, t, tcp_timer); u32 settimer = 0; unsigned long timetosend; - struct i40iw_sc_dev *dev; unsigned long flags; struct list_head timer_list; diff --cc drivers/infiniband/hw/nes/nes_utils.c index 0613eb5006cc,1dc0527e5a05..21b4a8373acf --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c @@@ -880,17 -881,16 +880,16 @@@ 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; - nesadapter->link_interrupt_count[1] = 0; - nesadapter->link_interrupt_count[2] = 0; - nesadapter->link_interrupt_count[3] = 0; + nesadapter->link_interrupt_count[0] = 0; + nesadapter->link_interrupt_count[1] = 0; + nesadapter->link_interrupt_count[2] = 0; + nesadapter->link_interrupt_count[3] = 0; spin_unlock_irqrestore(&nesadapter->phy_lock, flags); nesadapter->lc_timer.expires = jiffies + 3600 * HZ; /* 1 hour */ diff --cc drivers/infiniband/hw/qib/qib.h index 689f5d001892,f9541a0ee5cd..092ed8103842 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h @@@ -1280,9 -1299,10 +1280,9 @@@ int qib_twsi_blk_rd(struct qib_devdata int qib_twsi_blk_wr(struct qib_devdata *dd, int dev, int addr, const void *buffer, int len); void qib_get_eeprom_info(struct qib_devdata *); -#define qib_inc_eeprom_err(dd, eidx, incr) void qib_dump_lookup_output_queue(struct qib_devdata *); void qib_force_pio_avail_update(struct qib_devdata *); - void qib_clear_symerror_on_linkup(unsigned long opaque); + void qib_clear_symerror_on_linkup(struct timer_list *t); /* * Set LED override, only the two LSBs have "public" meaning, but