From patchwork Wed Sep 20 23:27:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962951 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 5FB956056A for ; Wed, 20 Sep 2017 23:31:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 529A929209 for ; Wed, 20 Sep 2017 23:31:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4735A29276; Wed, 20 Sep 2017 23:31: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 B8E4929233 for ; Wed, 20 Sep 2017 23:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbdITX3M (ORCPT ); Wed, 20 Sep 2017 19:29:12 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:53339 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbdITX2T (ORCPT ); Wed, 20 Sep 2017 19:28:19 -0400 Received: by mail-pg0-f48.google.com with SMTP id j70so2525943pgc.10 for ; Wed, 20 Sep 2017 16:28:19 -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=5qKGgFfAjTQCA7LzjdQ5MdBLs5H+PTU7ZzsINCHdS7E=; b=UobhF6wupR9KS/ir7lk+fmO4WcjoHeFl0rd6UVExs8SSFslTFq5jhtDO3bEYLjfUs0 aR2hJLgMf2+aKxItEZ44QnTh+1GacadEVwiSEWTTRCNnBMQMHx/Wcdnq/uSrZaCFSPMJ Y+5tEKrzw34YjceBQu8MLRGNOjpLGBb/QJyVM= 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=5qKGgFfAjTQCA7LzjdQ5MdBLs5H+PTU7ZzsINCHdS7E=; b=SpLgKWmhZEr0v4eLCpOpgKhy0NM5qP4Zzj4hHhZQcUMJ9Mccrcd+PgVFAQDx+9rdvR nuPCnMMT8NHN7ifNOaen/DyN3drOijDj/DWpMqOKtubMnfcW6eysVT2q/N4zUenZr2Dh hpM4BiefPFEUNOCJUyqRqbeDGPACbHBfnpphgD3DNaDU0fJQjp44NYZehy+CqCFJc4a6 Mq6XYJ9Brn77B5eMSW7C+jtaYjT+HkEK4151LuQIfAoxDvT1NbMKNkhhXC1xvSkhMn8h D5nC+tK6O+EfV+RkU5qDzZGLBZq4XMrL+JoRlbggYfo5afJjvIVv6c+wdhAW1ZbM7iOz 1FUg== X-Gm-Message-State: AHPjjUh0aFjbuoUaBlLRFP7GYpnaGy935upz2egbnIOIC2Sji8XbVO2m EvZcRGhBTxSMG+u+TpMoYcY/qA== X-Google-Smtp-Source: AOwi7QDHFFlK4eMxMSMKMjQ5yI9qumIWwlXO1R3I4hSew9xGpRoIJYC/iVIBVvi7uNBwPQEW4A1tYw== X-Received: by 10.84.139.67 with SMTP id 61mr3587822plq.51.1505950099043; Wed, 20 Sep 2017 16:28:19 -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 r81sm51964pfj.106.2017.09.20.16.28.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 16:28:14 -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 v2 13/31] timer: Remove meaningless .data/.function assignments Date: Wed, 20 Sep 2017 16:27:37 -0700 Message-Id: <1505950075-50223-14-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505950075-50223-1-git-send-email-keescook@chromium.org> References: <1505950075-50223-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 # for staging Acked-by: Krzysztof Halasa # for wan/hdlc* Acked-by: Jens Axboe # for amiflop --- 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 ac5aaafa461c..60f088babf27 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -266,7 +266,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; @@ -287,7 +287,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)); } } @@ -304,7 +303,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 {