From patchwork Thu Aug 31 23:29:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9933041 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 E709360309 for ; Thu, 31 Aug 2017 23:33:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC73A26D08 for ; Thu, 31 Aug 2017 23:33:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D152B26E49; Thu, 31 Aug 2017 23:33:00 +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 58EB826D08 for ; Thu, 31 Aug 2017 23:33:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbdHaXam (ORCPT ); Thu, 31 Aug 2017 19:30:42 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:36169 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751966AbdHaXaG (ORCPT ); Thu, 31 Aug 2017 19:30:06 -0400 Received: by mail-pg0-f47.google.com with SMTP id r133so3120241pgr.3 for ; Thu, 31 Aug 2017 16:30:06 -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=5fxsCR2ep0ns4ZwGsgrm2SkXR2LUZIub/8lFzCaWSRg=; b=jNkz2QYqiTUqfq82gvffAUESmj7+sCAZwAoeyHXsfOTSdOefGCPXTEbYSvcp0vjGtI O+SCFFhSmV+6SB0o/XhIuUYoIwtOzott4Pq5KNnhGL/BigLLoq4pKJYxy/hmlwGfcBvr gMlF4nsdaLMGrB+q/4L4AzY760TRTj72JtGTs= 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=5fxsCR2ep0ns4ZwGsgrm2SkXR2LUZIub/8lFzCaWSRg=; b=c3/eo0gqm5hAs4dSnsXuY3A5IizdDrkUxIWnnJl8vZovN5PrvQflbJ41f9HO9HP6cQ jjhiP8OpS54TlMvTGJxLGuZDTlBfBtlGrIKnacQ9inIoflmSQs7fCRLImwCm92TB7qKE Hwx+yjkmZb1eGraDnbY41f8yO/NHxDscP+qSwzAnzg8ykSnMB7it3/XXYgNZVZ6o0zrT hEhQwAEiZE5MdXi4EE3UduTiHNNORo4f+W46PBxeTZJroFbO3YskoE962NCBlMuPs6uM ADv+fQ0eDiVIdnuoSlPM2MdI9uHKYfP5WjnosCKw9vYd+CAwCkxgMNKsp6utUcRZ0vpo HMVA== X-Gm-Message-State: AHPjjUjfCkCKSUSL588MwKhuxlaT0dPzRFnXH5QvpF8O2U1ToCd1J8fc DyjEag8xWw6R2/fR X-Google-Smtp-Source: ADKCNb5qyKHCTXKA0o1fu9wolRN26nRFlTB3mMqBffF+j4TVPdvh7idLdZJoA1Wm5cL7sgCj9OiXbg== X-Received: by 10.98.204.21 with SMTP id a21mr139443pfg.242.1504222205848; Thu, 31 Aug 2017 16:30:05 -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 184sm970788pfg.0.2017.08.31.16.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:30:02 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , Krzysztof Halasa , Aditya Shankar , Ganesh Krishna , Greg Kroah-Hartman , Jens Axboe , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/31] timer: Remove meaningless .data/.function assignments Date: Thu, 31 Aug 2017 16:29:25 -0700 Message-Id: <1504222183-61202-14-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504222183-61202-1-git-send-email-keescook@chromium.org> References: <1504222183-61202-1-git-send-email-keescook@chromium.org> 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 Several timer users needlessly reset their .function/.data fields during their timer callback, but nothing else changes them. Some users do not use their .data field at all. Each instance is removed here. Cc: Krzysztof Halasa Cc: Aditya Shankar Cc: Ganesh Krishna Cc: Greg Kroah-Hartman Cc: Jens Axboe Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: devel@driverdev.osuosl.org Signed-off-by: Kees Cook Acked-by: Greg Kroah-Hartman Acked-by: Krzysztof Halasa Acked-by: Jens Axboe --- drivers/block/amiflop.c | 3 +-- drivers/net/wan/hdlc_cisco.c | 2 -- drivers/net/wan/hdlc_fr.c | 2 -- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +--- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index c4b1cba27178..6680d75bc857 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -323,7 +323,7 @@ static void fd_deselect (int drive) } -static void motor_on_callback(unsigned long nr) +static void motor_on_callback(unsigned long ignored) { if (!(ciaa.pra & DSKRDY) || --on_attempts == 0) { complete_all(&motor_on_completion); @@ -344,7 +344,6 @@ static int fd_motor_on(int nr) fd_select(nr); reinit_completion(&motor_on_completion); - motor_on_timer.data = nr; mod_timer(&motor_on_timer, jiffies + HZ/2); on_attempts = 10; diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index c696d42f4502..6c98d85f2773 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c @@ -276,8 +276,6 @@ static void cisco_timer(unsigned long arg) spin_unlock(&st->lock); st->timer.expires = jiffies + st->settings.interval * HZ; - st->timer.function = cisco_timer; - st->timer.data = arg; add_timer(&st->timer); } diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index de42faca076a..7da2424c28a4 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -644,8 +644,6 @@ static void fr_timer(unsigned long arg) state(hdlc)->settings.t391 * HZ; } - state(hdlc)->timer.function = fr_timer; - state(hdlc)->timer.data = arg; add_timer(&state(hdlc)->timer); } diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 68fd5b3b8b2d..2fca2b017093 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -275,7 +275,7 @@ static void update_scan_time(void) last_scanned_shadow[i].time_scan = jiffies; } -static void remove_network_from_shadow(unsigned long arg) +static void remove_network_from_shadow(unsigned long unused) { unsigned long now = jiffies; int i, j; @@ -296,7 +296,6 @@ static void remove_network_from_shadow(unsigned long arg) } if (last_scanned_cnt != 0) { - hAgingTimer.data = arg; mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME)); } } @@ -313,7 +312,6 @@ static int is_network_in_shadow(struct network_info *pstrNetworkInfo, int i; if (last_scanned_cnt == 0) { - hAgingTimer.data = (unsigned long)user_void; mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME)); state = -1; } else {