From patchwork Thu Oct 5 00:51:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 821575 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="U8WTvjs5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y6vgc53ydz9t3k for ; Thu, 5 Oct 2017 12:04:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752180AbdJEAvH (ORCPT ); Wed, 4 Oct 2017 20:51:07 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:48288 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbdJEAvE (ORCPT ); Wed, 4 Oct 2017 20:51:04 -0400 Received: by mail-pf0-f182.google.com with SMTP id n24so7123138pfk.5 for ; Wed, 04 Oct 2017 17:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=CU3OINddVxTzdcTHcEhSuXnwll61sfQxL4/k1QXLQCI=; b=U8WTvjs5axGRwmjWARFBBhE5f2Icrz/uUlDsGEEnngRkTTgieQ1/Nl1PL4M8OX0jwi akPLG0zgKwCFUENL1N+o5ittglsb0I1VQflFz40ajbawhb3gHNqrI/eAv/bbhQEIRPVv NaMF97kFInpzv2ir/BKggMruMHGP4619292Oc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=CU3OINddVxTzdcTHcEhSuXnwll61sfQxL4/k1QXLQCI=; b=Y20hC/4CDC2E1PXnncXwHYw6cM3fF7GjyVpMUgZ794nwmrkRR9c1U0OXW2mues3Gir 09KGCfQqw+CS9MnylMMQXXSSWUxKOwrwCjoI2PG0QThyt522bUyajBFjgbC0rqhl1eAq 3gdt6UEYMLiSpuAan7B1th9J8j30CHdmveCRDGFKSPLcP9lj0esjpTJGz8wwDAhA5n3z IvYXY+03UIGNB+DPQicsbfAwDStJqP7KXgAZmwuJ121P1C766tMxbyzAALPFa/UiX0xS y+CqFGHaxB8L0RkQ94uKr4sQ4dYnj5QbEr4Ig+HN7zyOzjSVY4ugbr9qKr38gf79GLZn ks9g== X-Gm-Message-State: AMCzsaWCLsxXGNxGKRaYMDuK0mtObAIMvxDxaoIrr/h+9yguGLKe1xCa OlpIa9uh9igQCxL6bL5y44b4nQ== X-Google-Smtp-Source: AOwi7QCf1nErdiXS65kFOFLc1tu/YnOcKcNBr/DoXReSuEifOKLFxQMjB67S1pCAPeV13GcAkzzuvQ== X-Received: by 10.101.74.206 with SMTP id c14mr3466319pgu.190.1507164663738; Wed, 04 Oct 2017 17:51:03 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id q13sm33310098pfi.110.2017.10.04.17.51.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 17:51:02 -0700 (PDT) Date: Wed, 4 Oct 2017 17:51:01 -0700 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Solomon Peachy , Kalle Valo , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Thomas Gleixner Subject: [PATCH] net/cw1200: Convert timers to use timer_setup() Message-ID: <20171005005101.GA23346@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Thomas Gleixner Signed-off-by: Kees Cook --- This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone. --- 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; }