From patchwork Tue Oct 24 09:28:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10023841 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 8A2A260381 for ; Tue, 24 Oct 2017 09:33:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81323288A9 for ; Tue, 24 Oct 2017 09:33:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7600D289D8; Tue, 24 Oct 2017 09:33:20 +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 02D17288A9 for ; Tue, 24 Oct 2017 09:33:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbdJXJ3G (ORCPT ); Tue, 24 Oct 2017 05:29:06 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:49349 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932318AbdJXJ2y (ORCPT ); Tue, 24 Oct 2017 05:28:54 -0400 Received: by mail-pg0-f66.google.com with SMTP id g6so14057557pgn.6 for ; Tue, 24 Oct 2017 02:28:54 -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=MIrk0OgZ23tvqgWQEkh+4DhZI62zuDea67RgshfCT1E=; b=FYlzwqvSwkBUF3DgZk+BcZ7BMdR6kPSFSvvyScggDS1qE4IVru7UCeDhncGboD/4ue m9k9C6RS8JEHaPrktpsKjDu9QA9F17QbZ6yDuzrpXXJ1TLTKmuSl6mRg2AS51X776QMt ERavlP/HXnVnpzqK5JdNaedZoQmiwIiXaSdpE= 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=MIrk0OgZ23tvqgWQEkh+4DhZI62zuDea67RgshfCT1E=; b=d23B6j5Y8G6coyh2K3RXrZ2DeQFBQtPf+JCMLBgThHKTvo3B3OBBO1Af93etDx2PuB DdP14Mm4ZRSd/gLF/AWOMqtB6mGbhjyn6hRv04fQZVIzH2S466t1c402Xz7F/Ytb5D48 D7yessxCE/xD4NBf8pvqfWkMZWL3lxlgzF2F2a6+qA8j1LeKSvxVZK4qNl1kjJg8O3jM yDltZcLq4GBZzyCP58tzdajSc0WD6QTHUwJyStuxGYSHiIKnnU08PiTkXNyhXQn+5JHT Kb3AIYGZQbsSKKtRAHzwuKNUX8R1m9KTSFtcLlgYLlBs1A6k+bdgXgEKARGDxZsFWN8L THgw== X-Gm-Message-State: AMCzsaWIJlsceUg4b2Mz2RUAcNkSSDGNBDdYE1wLh/ETDmfyldFI8Hqp lHmagqu1wIJUu4KRfjtgf60LiQ== X-Google-Smtp-Source: ABhQp+SckmtdfBXfRGxvcpvWjKGFLTR8OMaCC7pF/IAeD2pfPYGkYWkDREhS9o99vordfdc4fHHBfw== X-Received: by 10.98.14.75 with SMTP id w72mr15953674pfi.341.1508837334284; Tue, 24 Oct 2017 02:28:54 -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 g207sm16731757pfb.101.2017.10.24.02.28.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 02:28:53 -0700 (PDT) Date: Tue, 24 Oct 2017 02:28:52 -0700 From: Kees Cook To: Kalle Valo Cc: Simon Kelley , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drivers/wireless: atmel: Convert timers to use timer_setup() Message-ID: <20171024092852.GA47097@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: Simon Kelley Cc: Kalle Valo Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- drivers/net/wireless/atmel/atmel.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index e816d53c2c05..c9dd5e44c9c6 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -586,7 +586,7 @@ static int atmel_validate_channel(struct atmel_private *priv, int channel); static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header, u16 frame_len, u8 rssi); -static void atmel_management_timer(u_long a); +static void atmel_management_timer(struct timer_list *t); static void atmel_send_command(struct atmel_private *priv, int command, void *cmd, int cmd_size); static int atmel_send_command_wait(struct atmel_private *priv, int command, @@ -1579,8 +1579,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, priv->default_beacon_period = priv->beacon_period = 100; priv->listen_interval = 1; - setup_timer(&priv->management_timer, atmel_management_timer, - (unsigned long)dev); + timer_setup(&priv->management_timer, atmel_management_timer, 0); spin_lock_init(&priv->irqlock); spin_lock_init(&priv->timerlock); @@ -3434,10 +3433,9 @@ static void atmel_management_frame(struct atmel_private *priv, } /* run when timer expires */ -static void atmel_management_timer(u_long a) +static void atmel_management_timer(struct timer_list *t) { - struct net_device *dev = (struct net_device *) a; - struct atmel_private *priv = netdev_priv(dev); + struct atmel_private *priv = from_timer(priv, t, management_timer); unsigned long flags; /* Check if the card has been yanked. */