{"id":830225,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830225/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105129.GA146547@beast/","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":"<20171025105129.GA146547@beast>","list_archive_url":null,"date":"2017-10-25T10:51:29","name":"drivers/net: hippi: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"d56e48cd2ed40fa233bdc69142d1b9e24777d21f","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/20171025105129.GA146547@beast/mbox/","series":[{"id":10134,"url":"http://patchwork.ozlabs.org/api/1.2/series/10134/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10134","date":"2017-10-25T10:51:29","name":"drivers/net: hippi: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10134/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830225/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830225/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=\"YjhGhQvr\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRlY5bDqz9sPm\n\tfor ;\n\tWed, 25 Oct 2017 21:51:37 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932568AbdJYKvf (ORCPT );\n\tWed, 25 Oct 2017 06:51:35 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:52015 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932555AbdJYKvb (ORCPT\n\t); Wed, 25 Oct 2017 06:51:31 -0400","by mail-pg0-f68.google.com with SMTP id p9so17001251pgc.8\n\tfor ; Wed, 25 Oct 2017 03:51:31 -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\tc184sm5131893pfg.35.2017.10.25.03.51.29\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:51:29 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=date:from:to:cc:subject:message-id:mime-version:content-disposition;\n\tbh=q7IYcEGaz1NT9J/HKovftwrjzS338zyF1sSIPsUHEUo=;\n\tb=YjhGhQvrzx8YzHzte7eKoSeerB1tvKUH2dwjlXTqYI6ViukR2qPtfCdIsOEafd3kSd\n\tAiDfuBVV0Ow55z61C2fSiqJtsuQmvTX4evk30LikMAwhsDBCK7CWvg736wNrlZK6eY/c\n\tgK7QrRGqm6PEEJHjd3g1dIdGBS6D0P/s6sY7s=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version\n\t:content-disposition;\n\tbh=q7IYcEGaz1NT9J/HKovftwrjzS338zyF1sSIPsUHEUo=;\n\tb=pH5TGDmTSs5njKVqS26HhR8wkzJGsVp+GES0gld8Get4Xm3N+2Hv7MH/KeR++/LBTm\n\tgUr3ZJdbl8qp18/lmXEZvOCZusG6JJvpEsCurt0FfhmM3/it7d2xqXsPa0KGCEwnPSRl\n\tIj7utCSKHkF4xf0JFzCNE41qHyEOE3xQdm2iVKJ6If0AkGEG/MalPy/9+dWfVqd7ghNn\n\tu2lZnde8DVUSNDmqX2RUImP8sBsVSL/+aDdj4Lxb+KkCIKpmhlo49MOEFzQ+2JIWgKMK\n\tS6oxfGVsjz3mOMFCoQ6PojkCYzn4RBBSXm2n4GnihrjOnpfRJ5rxTTIqMIKIEBhiEJ23\n\tRQWQ==","X-Gm-Message-State":"AMCzsaUBta4j7xHx3FqDdjV2xomgbSzFfuamJ/0slS6pmA6xvAUzxN6c\n\tbg/Fm9rr+BpJB48Uq+OU4+gXeg==","X-Google-Smtp-Source":"ABhQp+SHOorb5/ZNBlAb5nu9UCzB1NX45jQWsCZ39FmT1uGd6j0mplTPKf9MJkJJTZ/GslU2SFcHRQ==","X-Received":"by 10.99.63.199 with SMTP id m190mr1645193pga.275.1508928690955; \n\tWed, 25 Oct 2017 03:51:30 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:51:29 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Jes Sorensen , linux-hippi@sunsite.dk,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: hippi: Convert timers to use timer_setup()","Message-ID":"<20171025105129.GA146547@beast>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"In preparation for unconditionally passing the struct timer_list pointer to\nall timer callbacks, switch to using the new timer_setup() and from_timer()\nto pass the timer pointer explicitly.\n\nCc: Jes Sorensen \nCc: linux-hippi@sunsite.dk\nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/hippi/rrunner.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c\nindex 76cc140774a2..8483f03d5a41 100644\n--- a/drivers/net/hippi/rrunner.c\n+++ b/drivers/net/hippi/rrunner.c\n@@ -1146,10 +1146,10 @@ static inline void rr_raz_rx(struct rr_private *rrpriv,\n \t}\n }\n \n-static void rr_timer(unsigned long data)\n+static void rr_timer(struct timer_list *t)\n {\n-\tstruct net_device *dev = (struct net_device *)data;\n-\tstruct rr_private *rrpriv = netdev_priv(dev);\n+\tstruct rr_private *rrpriv = from_timer(rrpriv, t, timer);\n+\tstruct net_device *dev = pci_get_drvdata(rrpriv->pci_dev);\n \tstruct rr_regs __iomem *regs = rrpriv->regs;\n \tunsigned long flags;\n \n@@ -1229,7 +1229,7 @@ static int rr_open(struct net_device *dev)\n \n \t/* Set the timer to switch to check for link beat and perhaps switch\n \t to an alternate media type. */\n-\tsetup_timer(&rrpriv->timer, rr_timer, (unsigned long)dev);\n+\ttimer_setup(&rrpriv->timer, rr_timer, 0);\n \trrpriv->timer.expires = RUN_AT(5*HZ); /* 5 sec. watchdog */\n \tadd_timer(&rrpriv->timer);\n \n","prefixes":[]}