lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/58] net/cw1200: Convert timers to use timer_setup()
    Date
    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>
    ---
    drivers/net/wireless/st/cw1200/pm.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/st/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
    index d2202ae92bdd..ded23df1ac1d 100644
    --- a/drivers/net/wireless/st/cw1200/pm.c
    +++ b/drivers/net/wireless/st/cw1200/pm.c
    @@ -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;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-10-17 02:50    [W:2.369 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site