Message ID | 1508200182-104605-18-git-send-email-keescook@chromium.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nuKFDp3s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGmm30g9z9sBZ for <patchwork-incoming@ozlabs.org>; Tue, 17 Oct 2017 11:49:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758573AbdJQAtl (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 16 Oct 2017 20:49:41 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:47834 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933295AbdJQArf (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 16 Oct 2017 20:47:35 -0400 Received: by mail-pf0-f169.google.com with SMTP id z11so74082pfk.4 for <netdev@vger.kernel.org>; Mon, 16 Oct 2017 17:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V6jvOQHg+OprHA0Nmxs+mXeDi31WOpQZi9/r8/RRPuI=; b=nuKFDp3soi/NSDmNur43ilDiHtXmho7C1nKTULfRdFQq/SflTvk8vfyGxtyxXWXo9K UsDMVrPWwWnhHNfVfPjohgY2c2of1yrXdyefhE8QWoXbTUSZKFmU/DlgmVQCbv125wqN 9IZUbUI5wMRPxj99r5PkXql2anHr/Ey9XalVs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V6jvOQHg+OprHA0Nmxs+mXeDi31WOpQZi9/r8/RRPuI=; b=Ty1MeuW2+LN0VLzC8RD7SoS0iL7SmZ17a0GW/u7ZpF0f4nGFvTfZz3J1P2OE1PNiam QHgejvVz+DfvhI6gDMsnsUHyP7TTaxtWMo/IlkjrtjYlX6jx84qoGs7NL7T/W6hgJSQB BS7OJ658/SSfVMJck+2XsgIKAYb9qSOiH08sMSeES8iDpy1tozyOycpoECjXm9EK89Qp XjJKfQidAF6BTwVyw23Wul4l9HHMaFkUaUgUnBqsqT3K7dLBJ/uKnd2ND63AJF4X4TCC /Y/zmK8j98P9aAx6G0CU2nt1XRrigXNqIZAMRvpGVBDMAkHq+230zXdWsv4rZMrrmMJq gHvg== X-Gm-Message-State: AMCzsaW+A68vNKcS/zC8wpXVcyFOeRmQTJu+66uNk7LAf4Ob8q0FFEh5 ofsEPV/PIR3LSgcNXRCEoYmA2g== X-Google-Smtp-Source: AOwi7QBHFIV1D2cx+B50SK5r+I49tw7rmj5DERoV0JMDGXkDiCg1LInAjowAYSa2hbJ6ieVl/LKWlQ== X-Received: by 10.98.15.22 with SMTP id x22mr10127306pfi.13.1508201254661; Mon, 16 Oct 2017 17:47:34 -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 j3sm3101121pfh.74.2017.10.16.17.47.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:47:29 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, Solomon Peachy <pizza@shaftnet.org>, Kalle Valo <kvalo@codeaurora.org>, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 17/58] net/cw1200: Convert timers to use timer_setup() Date: Mon, 16 Oct 2017 17:29:01 -0700 Message-Id: <1508200182-104605-18-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
networking: Convert timers to use timer_setup()
|
expand
|
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; }
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(-)