{"id":808465,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808465/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-14-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504222183-61202-14-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-08-31T23:29:25","name":"[13/31] timer: Remove meaningless .data/.function assignments","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"6cf7e4f106f59ebe0eee1f0b80d563dc1d3be376","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/1.2/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504222183-61202-14-git-send-email-keescook@chromium.org/mbox/","series":[{"id":923,"url":"http://patchwork.ozlabs.org/api/1.2/series/923/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=923","date":"2017-08-31T23:29:25","name":null,"version":1,"mbox":"http://patchwork.ozlabs.org/series/923/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808465/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808465/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"jNkz2QYq\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjzFP6TPrz9s7p\n\tfor ;\n\tFri, 1 Sep 2017 09:32:57 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751966AbdHaXam (ORCPT );\n\tThu, 31 Aug 2017 19:30:42 -0400","from mail-pg0-f43.google.com ([74.125.83.43]:32868 \"EHLO\n\tmail-pg0-f43.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751965AbdHaXaG (ORCPT\n\t); Thu, 31 Aug 2017 19:30:06 -0400","by mail-pg0-f43.google.com with SMTP id t3so3238426pgt.0\n\tfor ; Thu, 31 Aug 2017 16:30:06 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\t184sm970788pfg.0.2017.08.31.16.29.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 16:30:02 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=5fxsCR2ep0ns4ZwGsgrm2SkXR2LUZIub/8lFzCaWSRg=;\n\tb=jNkz2QYqiTUqfq82gvffAUESmj7+sCAZwAoeyHXsfOTSdOefGCPXTEbYSvcp0vjGtI\n\tO+SCFFhSmV+6SB0o/XhIuUYoIwtOzott4Pq5KNnhGL/BigLLoq4pKJYxy/hmlwGfcBvr\n\tgMlF4nsdaLMGrB+q/4L4AzY760TRTj72JtGTs=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=5fxsCR2ep0ns4ZwGsgrm2SkXR2LUZIub/8lFzCaWSRg=;\n\tb=IP4WKyXNqK6if9v2PIKS0PKP8yyV2LFwCvLnsxAf/T6kPgCaL8SYzdx5yVUL0QPK0m\n\tPSW0uiOWx/sNqCONUQXrIIwwqMYuVhXMPfSXHFNQmx18dPUHtD2LShPZlXNAPbZQK+wS\n\tGuTgEXNEtXtS1ox0wozFvs1Ge+dyOFpRzoZssapppeRpxX/LweYOM3HtQc91nFXSkbH0\n\tEYrOGhjN0TUaC23cteF26MghDtHTclAOPOp+v5f7p9seCXmLzF+8SDKOvpX1PIHKXZzI\n\tI0wwYftRy8wA5v1twhH801CQqiuB5qZ1+B1sn9lDGqDHAcJpNlyX1MrOlkXjb4swot8m\n\tokEg==","X-Gm-Message-State":"AHPjjUhJbihFAezq94IaGdIWXyOQ8kjzsh2u9p6WTN/y25K+nsYIZjeD\n\tN5ayOrsRYp17D7Kz","X-Google-Smtp-Source":"ADKCNb5qyKHCTXKA0o1fu9wolRN26nRFlTB3mMqBffF+j4TVPdvh7idLdZJoA1Wm5cL7sgCj9OiXbg==","X-Received":"by 10.98.204.21 with SMTP id a21mr139443pfg.242.1504222205848;\n\tThu, 31 Aug 2017 16:30:05 -0700 (PDT)","From":"Kees Cook ","To":"Thomas Gleixner ","Cc":"Kees Cook , Krzysztof Halasa ,\n\tAditya Shankar ,\n\tGanesh Krishna ,\n\tGreg Kroah-Hartman ,\n\tJens Axboe , netdev@vger.kernel.org,\n\tlinux-wireless@vger.kernel.org, devel@driverdev.osuosl.org,\n\tlinux-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Several timer users needlessly reset their .function/.data fields during\ntheir timer callback, but nothing else changes them. Some users do not\nuse their .data field at all. Each instance is removed here.\n\nCc: Krzysztof Halasa \nCc: Aditya Shankar \nCc: Ganesh Krishna \nCc: Greg Kroah-Hartman \nCc: Jens Axboe \nCc: netdev@vger.kernel.org\nCc: linux-wireless@vger.kernel.org\nCc: devel@driverdev.osuosl.org\nSigned-off-by: Kees Cook \n---\n drivers/block/amiflop.c | 3 +--\n drivers/net/wan/hdlc_cisco.c | 2 --\n drivers/net/wan/hdlc_fr.c | 2 --\n drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +---\n 4 files changed, 2 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c\nindex c4b1cba27178..6680d75bc857 100644\n--- a/drivers/block/amiflop.c\n+++ b/drivers/block/amiflop.c\n@@ -323,7 +323,7 @@ static void fd_deselect (int drive)\n \n }\n \n-static void motor_on_callback(unsigned long nr)\n+static void motor_on_callback(unsigned long ignored)\n {\n \tif (!(ciaa.pra & DSKRDY) || --on_attempts == 0) {\n \t\tcomplete_all(&motor_on_completion);\n@@ -344,7 +344,6 @@ static int fd_motor_on(int nr)\n \t\tfd_select(nr);\n \n \t\treinit_completion(&motor_on_completion);\n-\t\tmotor_on_timer.data = nr;\n \t\tmod_timer(&motor_on_timer, jiffies + HZ/2);\n \n \t\ton_attempts = 10;\ndiff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c\nindex c696d42f4502..6c98d85f2773 100644\n--- a/drivers/net/wan/hdlc_cisco.c\n+++ b/drivers/net/wan/hdlc_cisco.c\n@@ -276,8 +276,6 @@ static void cisco_timer(unsigned long arg)\n \tspin_unlock(&st->lock);\n \n \tst->timer.expires = jiffies + st->settings.interval * HZ;\n-\tst->timer.function = cisco_timer;\n-\tst->timer.data = arg;\n \tadd_timer(&st->timer);\n }\n \ndiff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c\nindex de42faca076a..7da2424c28a4 100644\n--- a/drivers/net/wan/hdlc_fr.c\n+++ b/drivers/net/wan/hdlc_fr.c\n@@ -644,8 +644,6 @@ static void fr_timer(unsigned long arg)\n \t\t\tstate(hdlc)->settings.t391 * HZ;\n \t}\n \n-\tstate(hdlc)->timer.function = fr_timer;\n-\tstate(hdlc)->timer.data = arg;\n \tadd_timer(&state(hdlc)->timer);\n }\n \ndiff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c\nindex 68fd5b3b8b2d..2fca2b017093 100644\n--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c\n+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c\n@@ -275,7 +275,7 @@ static void update_scan_time(void)\n \t\tlast_scanned_shadow[i].time_scan = jiffies;\n }\n \n-static void remove_network_from_shadow(unsigned long arg)\n+static void remove_network_from_shadow(unsigned long unused)\n {\n \tunsigned long now = jiffies;\n \tint i, j;\n@@ -296,7 +296,6 @@ static void remove_network_from_shadow(unsigned long arg)\n \t}\n \n \tif (last_scanned_cnt != 0) {\n-\t\thAgingTimer.data = arg;\n \t\tmod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));\n \t}\n }\n@@ -313,7 +312,6 @@ static int is_network_in_shadow(struct network_info *pstrNetworkInfo,\n \tint i;\n \n \tif (last_scanned_cnt == 0) {\n-\t\thAgingTimer.data = (unsigned long)user_void;\n \t\tmod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));\n \t\tstate = -1;\n \t} else {\n","prefixes":["13/31"]}