Commit e3dcf8bb authored by Kees Cook's avatar Kees Cook Committed by Kalle Valo
Browse files

cw1200: 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: Solomon Peachy <pizza@shaftnet.org>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3e79202b

drivers/net/wireless/st/cw1200/main.c

+1 −2
Original line number Diff line number Diff line
@@ -373,8 +373,7 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, 
	INIT_WORK(&priv->update_filtering_work, cw1200_update_filtering_work);

	INIT_WORK(&priv->set_beacon_wakeup_period_work,

		  cw1200_set_beacon_wakeup_period_work);

	setup_timer(&priv->mcast_timeout, cw1200_mcast_timeout,

		    (unsigned long)priv);

	timer_setup(&priv->mcast_timeout, cw1200_mcast_timeout, 0);



	if (cw1200_queue_stats_init(&priv->tx_queue_stats,

				    CW1200_LINK_ID_MAX,

drivers/net/wireless/st/cw1200/queue.c

+3 −3
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ static void __cw1200_queue_gc(struct cw1200_queue *queue, 
	}

}



static void cw1200_queue_gc(unsigned long arg)

static void cw1200_queue_gc(struct timer_list *t)

{

	LIST_HEAD(list);

	struct cw1200_queue *queue =

		(struct cw1200_queue *)arg;

		from_timer(queue, t, gc);



	spin_lock_bh(&queue->lock);

	__cw1200_queue_gc(queue, &list, true);
@@ -179,7 +179,7 @@ int cw1200_queue_init(struct cw1200_queue *queue, 
	INIT_LIST_HEAD(&queue->pending);

	INIT_LIST_HEAD(&queue->free_pool);

	spin_lock_init(&queue->lock);

	setup_timer(&queue->gc, cw1200_queue_gc, (unsigned long)queue);

	timer_setup(&queue->gc, cw1200_queue_gc, 0);



	queue->pool = kzalloc(sizeof(struct cw1200_queue_item) * capacity,

			GFP_KERNEL);

drivers/net/wireless/st/cw1200/sta.c

+2 −3
Original line number Diff line number Diff line
@@ -2112,10 +2112,9 @@ void cw1200_multicast_stop_work(struct work_struct *work) 
	}

}



void cw1200_mcast_timeout(unsigned long arg)

void cw1200_mcast_timeout(struct timer_list *t)

{

	struct cw1200_common *priv =

		(struct cw1200_common *)arg;

	struct cw1200_common *priv = from_timer(priv, t, mcast_timeout);



	wiphy_warn(priv->hw->wiphy,

		   "Multicast delivery timeout.\n");

drivers/net/wireless/st/cw1200/sta.h

+1 −1
Original line number Diff line number Diff line
@@ -117,6 +117,6 @@ void cw1200_set_tim_work(struct work_struct *work); 
void cw1200_set_cts_work(struct work_struct *work);

void cw1200_multicast_start_work(struct work_struct *work);

void cw1200_multicast_stop_work(struct work_struct *work);

void cw1200_mcast_timeout(unsigned long arg);

void cw1200_mcast_timeout(struct timer_list *t);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE