{"id":830230,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830230/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105320.GA146603@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":"<20171025105320.GA146603@beast>","list_archive_url":null,"date":"2017-10-25T10:53:20","name":"drivers/net: sxgbe: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"a16d3ff7a2677c70ce7d8aa6f7d86d690d0e586e","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/20171025105320.GA146603@beast/mbox/","series":[{"id":10139,"url":"http://patchwork.ozlabs.org/api/1.2/series/10139/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10139","date":"2017-10-25T10:53:20","name":"drivers/net: sxgbe: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10139/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830230/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830230/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=\"XawW0rc9\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRnv6GYRz9sNx\n\tfor ;\n\tWed, 25 Oct 2017 21:53:39 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932644AbdJYKxZ (ORCPT );\n\tWed, 25 Oct 2017 06:53:25 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:46983 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932482AbdJYKxX (ORCPT\n\t); Wed, 25 Oct 2017 06:53:23 -0400","by mail-pf0-f194.google.com with SMTP id p87so21940439pfj.3\n\tfor ; Wed, 25 Oct 2017 03:53:22 -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\tg207sm4749230pfb.101.2017.10.25.03.53.21\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:53:21 -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=DLiFJY3ZEGdOrsEeNuYQidrnC3XvIisjBpu3Zsc3xjI=;\n\tb=XawW0rc961LKhgvjt4kTVaMc6BKEXSUrt4gfBkELLCeihalbaPxTutsgsLmlZngQxN\n\te+Pp/9FeuyBUuRPU/xrllAGFyf/Vn848J2064GYSjD2Encc5Oci42ln6WFUFdPo9K808\n\t6U/60BgAdfO+j7t45KXGwUlYHOJtQSykd30m4=","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=DLiFJY3ZEGdOrsEeNuYQidrnC3XvIisjBpu3Zsc3xjI=;\n\tb=Xs5fOAVa6kVVwrIcv0R7w6BAC8zl7EoFtUjKRmUXqAmKxIOazgBBXk6sQSPetQaLHy\n\t/3DooaOhZZ0hkK0/RQjCXb87Za9x5xpti0CrouX2TcEGQ+sjDBzznJq1yqurCRVcnQVJ\n\t/IBzVh6G9QfzIhtS9WO/C2XibKxuxydb6btYPWswFGHjexZoZTPJFrBBmwcltZtKPlCl\n\tT2K9oS1+oNlO1vLhsYHz2pSarAGrOqezXawln/73VY3/3rn6Rvtxc6VRfF6xO2af4Apk\n\t4KpacXqGh17rcZNukiTNabGv7rqKpmTnf9IZ987mxOD7q/dGL5P5CBBGP/5pDnLAz6H+\n\t73pg==","X-Gm-Message-State":"AMCzsaVhm1UW1qnwyR61rDyBjkJ/Cf6/Q//knnWaJQ+W9BRFKIcGiHcN\n\toZPo1uHK63aLtirnbTmZV73nfQ==","X-Google-Smtp-Source":"ABhQp+T0ZbbdaCWvqsy0oECmKnFxyolzhuSMKF3FtCEIv4cxmy7ksoOHeUsOd/LDpY36uFzEGotedw==","X-Received":"by 10.84.240.6 with SMTP id y6mr1406109plk.78.1508928802530;\n\tWed, 25 Oct 2017 03:53:22 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:53:20 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Byungho An , Girish K S ,\n\tVipul Pandya ,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: sxgbe: Convert timers to use timer_setup()","Message-ID":"<20171025105320.GA146603@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: Byungho An \nCc: Girish K S \nCc: Vipul Pandya \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 16 +++++++---------\n 1 file changed, 7 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c\nindex 89831adb8eb7..fd35d8004a78 100644\n--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c\n+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c\n@@ -105,9 +105,9 @@ void sxgbe_disable_eee_mode(struct sxgbe_priv_data * const priv)\n * If there is no data transfer and if we are not in LPI state,\n * then MAC Transmitter can be moved to LPI state.\n */\n-static void sxgbe_eee_ctrl_timer(unsigned long arg)\n+static void sxgbe_eee_ctrl_timer(struct timer_list *t)\n {\n-\tstruct sxgbe_priv_data *priv = (struct sxgbe_priv_data *)arg;\n+\tstruct sxgbe_priv_data *priv = from_timer(priv, t, eee_ctrl_timer);\n \n \tsxgbe_enable_eee_mode(priv);\n \tmod_timer(&priv->eee_ctrl_timer, SXGBE_LPI_TIMER(eee_timer));\n@@ -134,8 +134,7 @@ bool sxgbe_eee_init(struct sxgbe_priv_data * const priv)\n \t\t\treturn false;\n \n \t\tpriv->eee_active = 1;\n-\t\tsetup_timer(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer,\n-\t\t\t (unsigned long)priv);\n+\t\ttimer_setup(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer, 0);\n \t\tpriv->eee_ctrl_timer.expires = SXGBE_LPI_TIMER(eee_timer);\n \t\tadd_timer(&priv->eee_ctrl_timer);\n \n@@ -1002,13 +1001,13 @@ static void sxgbe_disable_mtl_engine(struct sxgbe_priv_data *priv)\n \n /**\n * sxgbe_tx_timer: mitigation sw timer for tx.\n- * @data: data pointer\n+ * @t: timer pointer\n * Description:\n * This is the timer handler to directly invoke the sxgbe_tx_clean.\n */\n-static void sxgbe_tx_timer(unsigned long data)\n+static void sxgbe_tx_timer(struct timer_list *t)\n {\n-\tstruct sxgbe_tx_queue *p = (struct sxgbe_tx_queue *)data;\n+\tstruct sxgbe_tx_queue *p = from_timer(p, t, txtimer);\n \tsxgbe_tx_queue_clean(p);\n }\n \n@@ -1028,8 +1027,7 @@ static void sxgbe_tx_init_coalesce(struct sxgbe_priv_data *priv)\n \t\tstruct sxgbe_tx_queue *p = priv->txq[queue_num];\n \t\tp->tx_coal_frames = SXGBE_TX_FRAMES;\n \t\tp->tx_coal_timer = SXGBE_COAL_TX_TIMER;\n-\t\tsetup_timer(&p->txtimer, sxgbe_tx_timer,\n-\t\t\t (unsigned long)&priv->txq[queue_num]);\n+\t\ttimer_setup(&p->txtimer, sxgbe_tx_timer, 0);\n \t\tp->txtimer.expires = SXGBE_COAL_TIMER(p->tx_coal_timer);\n \t\tadd_timer(&p->txtimer);\n \t}\n","prefixes":[]}