{"id":830223,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830223/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105103.GA146494@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":"<20171025105103.GA146494@beast>","list_archive_url":null,"date":"2017-10-25T10:51:03","name":"drivers/net: 3com/3c515: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"f326449b0eab533f341c57b990ccfa6f82730466","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/20171025105103.GA146494@beast/mbox/","series":[{"id":10132,"url":"http://patchwork.ozlabs.org/api/1.2/series/10132/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10132","date":"2017-10-25T10:51:03","name":"drivers/net: 3com/3c515: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10132/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830223/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830223/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=\"eANUMLr2\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRlC5mHWz9t16\n\tfor ;\n\tWed, 25 Oct 2017 21:51:19 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932456AbdJYKvI (ORCPT );\n\tWed, 25 Oct 2017 06:51:08 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:54798 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932444AbdJYKvG (ORCPT\n\t); Wed, 25 Oct 2017 06:51:06 -0400","by mail-pg0-f68.google.com with SMTP id l24so16994491pgu.11\n\tfor ; Wed, 25 Oct 2017 03:51: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\ta81sm4800227pfe.32.2017.10.25.03.51.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:51:04 -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=61o/ayCBUbAFrR0G0XZU8/yCf7s4q31LKnM/Nc/bAGo=;\n\tb=eANUMLr2oDTMskRvZdU21S/qqY9zOP/10P5SlyXD2LmbMnxnjiUR03WOjZDQp5e8yE\n\t2xaCOurC9rSScomyotFpyCItk8sVlXMJJEx1+7sXibwwOcgHaapxUh8wNydG2S9/ny/F\n\tXVpCadBgCY+PcJtkTevLTIJm3TBSnLq93bG2g=","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=61o/ayCBUbAFrR0G0XZU8/yCf7s4q31LKnM/Nc/bAGo=;\n\tb=EVYdojk7ZMrUeWYoKPuybEM8LdIgzwnpVZs5gcHJ+QVqt+IL9aXuPOBBRulG762/j+\n\tREhLd5sPBS9/aNidlVWE8BtcZiQPZza8gc5qe1ieQndt6S1jDTphXeH9dxXz+KVUga4t\n\tnaWjKTIyEO4cuGb7V1Kw6m1P/289SgJ0s9Pjut4nXS7f0UyS1HsH+3CC2l+MONVg5VU/\n\tmmkvoe5fURCURHGiya0j149WtiSds5PDu+zYqstfBJ56J4EjahUa90+6jBPrt+WISES6\n\tlk+XhYbJwRayAuUz4ZzI2bmMuEwQxsMZH5Qwnvc0WJfOfbcPu4W9mRMf6K7VT8J9IK/1\n\tQt8Q==","X-Gm-Message-State":"AMCzsaXeUHft30L53j3m+bsOnDfkVpXT492/7xkFAQfieN7LmR9X+ss2\n\teXwYDzmejpfWvWDkUejZGQ/BNA==","X-Google-Smtp-Source":"ABhQp+RyXXsNXdN2wKoXa7nyVQv42nyW5IPNpJxzKKCJ6y4s4O3TbvlG8QyTP2uGzJL9OMr2YkzF+g==","X-Received":"by 10.84.211.137 with SMTP id c9mr1473804pli.218.1508928665937; \n\tWed, 25 Oct 2017 03:51:05 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:51:03 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Thomas Gleixner ,\n\tStephen Hemminger ,\n\tJohannes Berg ,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: 3com/3c515: Convert timers to use timer_setup()","Message-ID":"<20171025105103.GA146494@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: \"David S. Miller\" \nCc: Thomas Gleixner \nCc: Stephen Hemminger \nCc: Johannes Berg \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/ethernet/3com/3c515.c | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c\nindex c5987f518cb2..b648e3f95c01 100644\n--- a/drivers/net/ethernet/3com/3c515.c\n+++ b/drivers/net/ethernet/3com/3c515.c\n@@ -367,7 +367,7 @@ static struct net_device *corkscrew_scan(int unit);\n static int corkscrew_setup(struct net_device *dev, int ioaddr,\n \t\t\t struct pnp_dev *idev, int card_number);\n static int corkscrew_open(struct net_device *dev);\n-static void corkscrew_timer(unsigned long arg);\n+static void corkscrew_timer(struct timer_list *t);\n static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,\n \t\t\t\t\tstruct net_device *dev);\n static int corkscrew_rx(struct net_device *dev);\n@@ -627,7 +627,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,\n \n \tspin_lock_init(&vp->lock);\n \n-\tsetup_timer(&vp->timer, corkscrew_timer, (unsigned long) dev);\n+\ttimer_setup(&vp->timer, corkscrew_timer, 0);\n \n \t/* Read the station address from the EEPROM. */\n \tEL3WINDOW(0);\n@@ -869,11 +869,11 @@ static int corkscrew_open(struct net_device *dev)\n \treturn 0;\n }\n \n-static void corkscrew_timer(unsigned long data)\n+static void corkscrew_timer(struct timer_list *t)\n {\n #ifdef AUTOMEDIA\n-\tstruct net_device *dev = (struct net_device *) data;\n-\tstruct corkscrew_private *vp = netdev_priv(dev);\n+\tstruct corkscrew_private *vp = from_timer(vp, t, timer);\n+\tstruct net_device *dev = vp->our_dev;\n \tint ioaddr = dev->base_addr;\n \tunsigned long flags;\n \tint ok = 0;\n","prefixes":[]}