Commit d3e99b2d authored Oct 16, 2017 by Kees Cook Committed by David S. Miller Oct 18, 2017

net/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: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent abec4be3

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ struct cw1200_suspend_state {
		u8 prev_ps_mode;
		};

		static void cw1200_pm_stay_awake_tmo(unsigned long arg)
		static void cw1200_pm_stay_awake_tmo(struct timer_list *unused)
		{
		/* XXX what's the point of this ? */
		}
		@@ -101,8 +101,7 @@ int cw1200_pm_init(struct cw1200_pm_state *pm,
		{
		spin_lock_init(&pm->lock);

		setup_timer(&pm->stay_awake, cw1200_pm_stay_awake_tmo,
		(unsigned long)pm);
		timer_setup(&pm->stay_awake, cw1200_pm_stay_awake_tmo, 0);

		return 0;
		}

Admin message