From patchwork Tue Oct 24 09:29:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10023845 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9613260381 for ; Tue, 24 Oct 2017 09:33:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E6AE289D3 for ; Tue, 24 Oct 2017 09:33:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FA88288A9; Tue, 24 Oct 2017 09:33:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D55288A9 for ; Tue, 24 Oct 2017 09:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932189AbdJXJdZ (ORCPT ); Tue, 24 Oct 2017 05:33:25 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:49922 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbdJXJ3D (ORCPT ); Tue, 24 Oct 2017 05:29:03 -0400 Received: by mail-pf0-f196.google.com with SMTP id i5so19254196pfe.6 for ; Tue, 24 Oct 2017 02:29:02 -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=VjqZWZuW8Tinxw0K6mkMKuOswt7fqzAvvoEBCciVxHw=; b=DXX/QljxsJ4rngfaEoJI2OjLkv0JW9tHRjVmwqAEW9GYd+5QtLysKnrG1VRG4Z9+LD krjfn4sUFXWIs47yll4S3llSqN1zc+gKfpuh/7jFrSLYW41jw40MWgqwnErzrMV9wW5s JlHIcNYkEJmOJCuf4CzlboPkwHTA9LcddUQpg= 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=VjqZWZuW8Tinxw0K6mkMKuOswt7fqzAvvoEBCciVxHw=; b=uJHnRldHLoANDzx/H7HdAgeWSPvn9JHFIytcPmpekX0bAqgcgg//7tnYY1U2/+vzO7 9RGkP9l6KyhPbfZ1EqYIphKv4ad7tfLg9MoMcjB1kkdZk1rIEm3O8z26Br8+Rj59GlOe 3cHYXqRwF8BNNCkg6FQlK/n2M7gIV1dNj8V71LMDnA2S1Fa3p71FetwXRcFxcMVaN/Wi oqnxqXaHJwhXWo/ADNXInPqFomFVcJSIMm5pUjeUimdbb8ODVYSyOcNGiaoqRr3AwUmU 2i97dHeUosXvzUAxLrjqiJuuHb4c7v3K1b4NP/sQHQZcdjFkJB2IucBuy/FeLbbSRGh9 2bIw== X-Gm-Message-State: AMCzsaVV5dnkqjvI7anLCIEmAhkbA2aKcMzhyNRBdjZAWtNGWsySspPl 0iwHItV6c8nDBkOA/MXBDjWd4A== X-Google-Smtp-Source: ABhQp+Tp2366vhQ0hMLOIJ7Tg6ZqOga/A9k64tAOYUagtKS1fDyERAaOz7bHPVOp80ejcRBagHTRMg== X-Received: by 10.99.97.149 with SMTP id v143mr14587304pgb.413.1508837342476; Tue, 24 Oct 2017 02:29:02 -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 w5sm7968565pfw.51.2017.10.24.02.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 02:29:01 -0700 (PDT) Date: Tue, 24 Oct 2017 02:29:00 -0700 From: Kees Cook To: Kalle Valo Cc: Solomon Peachy , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drivers/wireless: cw1200: Convert timers to use timer_setup() Message-ID: <20171024092900.GA47129@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Kees Cook --- drivers/net/wireless/st/cw1200/main.c | 3 +-- drivers/net/wireless/st/cw1200/queue.c | 6 +++--- drivers/net/wireless/st/cw1200/sta.c | 5 ++--- drivers/net/wireless/st/cw1200/sta.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/st/cw1200/main.c b/drivers/net/wireless/st/cw1200/main.c index dc478cedbde0..a186d1df1f29 100644 --- a/drivers/net/wireless/st/cw1200/main.c +++ b/drivers/net/wireless/st/cw1200/main.c @@ -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, diff --git a/drivers/net/wireless/st/cw1200/queue.c b/drivers/net/wireless/st/cw1200/queue.c index 0ba5ef9b3e7b..5153d2cfd991 100644 --- a/drivers/net/wireless/st/cw1200/queue.c +++ b/drivers/net/wireless/st/cw1200/queue.c @@ -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); diff --git a/drivers/net/wireless/st/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c index a52224836a2b..03687a80d6e9 100644 --- a/drivers/net/wireless/st/cw1200/sta.c +++ b/drivers/net/wireless/st/cw1200/sta.c @@ -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"); diff --git a/drivers/net/wireless/st/cw1200/sta.h b/drivers/net/wireless/st/cw1200/sta.h index a0bacaa39b31..719de34dcbfe 100644 --- a/drivers/net/wireless/st/cw1200/sta.h +++ b/drivers/net/wireless/st/cw1200/sta.h @@ -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