{"id":830228,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830228/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105114.GA146515@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":"<20171025105114.GA146515@beast>","list_archive_url":null,"date":"2017-10-25T10:51:14","name":"drivers/net: can: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"79dff4f9f0a1a8f4af433305789459547b3d1ac5","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/20171025105114.GA146515@beast/mbox/","series":[{"id":10137,"url":"http://patchwork.ozlabs.org/api/1.2/series/10137/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10137","date":"2017-10-25T10:51:14","name":"drivers/net: can: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10137/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830228/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830228/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=\"IY3/mQaV\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRnC5NVxz9t16\n\tfor ;\n\tWed, 25 Oct 2017 21:53:03 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932507AbdJYKvW (ORCPT );\n\tWed, 25 Oct 2017 06:51:22 -0400","from mail-pf0-f195.google.com ([209.85.192.195]:57243 \"EHLO\n\tmail-pf0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932441AbdJYKvR (ORCPT\n\t); Wed, 25 Oct 2017 06:51:17 -0400","by mail-pf0-f195.google.com with SMTP id b85so21923655pfj.13\n\tfor ; Wed, 25 Oct 2017 03:51:16 -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\tb9sm4769305pff.48.2017.10.25.03.51.15\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:51:15 -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=/7yiRzD26aoLKqsFneBlJLunZexCCMqDeyKKaXSe6H0=;\n\tb=IY3/mQaV/j2RRfqfnWr7F7BOzBbdh/AvBDindtPqiM9NPHVcp78QYIuPqouzv2RH2l\n\t/ipVjDE6ZZyp7vwHHHaa7j57ryzEGhZ1kuyc40mT9pSaFUs94Fkvry6BODyJnBAD8Zaf\n\tL7RAvdzltRPM+G6Io1Ys9gq2v5+Dhzt0SOYKA=","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=/7yiRzD26aoLKqsFneBlJLunZexCCMqDeyKKaXSe6H0=;\n\tb=RDjtUBqZbmr616SBLkNHIevLlTuNNOCS6xe3WWZcHyKCeY07Z01cfiL2JhzXpc4uIj\n\tECZoI1nSsb1VBvobYVTkbb61JPop01D87JUHf+GrdJupN6EWYXP8EjAC64466ElmOxP3\n\tjGXHi05ncLmzUrS0uNbzkDJJJVecpnYJHeYdpz79/dMan2U4gcKWLF7i11ese+InopIo\n\tNjED6JJjeqeWItPUkvfFGy5KXZR8Kh0Mr1XACddMVq17669co9OxdTiMDEDEBW81Nqkm\n\tmYrIx6ZHfBEeTK6MiZXKBdbtTUQz7P0noF2j+pMUBlW1O4DZKRNcpJ//IYHdfUkZCVGi\n\tVCuw==","X-Gm-Message-State":"AMCzsaV4PFhm1Ysgv13KYpxro8pdgu7Q7gUqXLVk9axjr6938l8Ym40y\n\tbfXEnlZRxd7+EkS02U6tcg3OfQ==","X-Google-Smtp-Source":"ABhQp+SqKZpMZ2tPwUP14L5/5Xx9/jp8XOCnH7EG5Rg25vYdy3gcp2eARaYn0cGmIAKsnmko5jpS+A==","X-Received":"by 10.84.245.145 with SMTP id j17mr1394550pll.163.1508928676649; \n\tWed, 25 Oct 2017 03:51:16 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:51:14 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Wolfgang Grandegger ,\n\tMarc Kleine-Budde ,\n\tAllen Pais , linux-can@vger.kernel.org,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: can: Convert timers to use timer_setup()","Message-ID":"<20171025105114.GA146515@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: Wolfgang Grandegger \nCc: Marc Kleine-Budde \nCc: \"David S. Miller\" \nCc: Allen Pais \nCc: linux-can@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/can/grcan.c | 19 ++++++++-----------\n drivers/net/can/sja1000/peak_pcmcia.c | 6 +++---\n drivers/net/can/usb/peak_usb/pcan_usb.c | 10 ++++++----\n 3 files changed, 17 insertions(+), 18 deletions(-)","diff":"diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c\nindex 8570cfdaea75..897c6b113d3f 100644\n--- a/drivers/net/can/grcan.c\n+++ b/drivers/net/can/grcan.c\n@@ -807,10 +807,10 @@ static irqreturn_t grcan_interrupt(int irq, void *dev_id)\n * is not ONGOING (TX might be stuck in ONGOING due to a harwrware bug\n * for single shot)\n */\n-static void grcan_running_reset(unsigned long data)\n+static void grcan_running_reset(struct timer_list *t)\n {\n-\tstruct net_device *dev = (struct net_device *)data;\n-\tstruct grcan_priv *priv = netdev_priv(dev);\n+\tstruct grcan_priv *priv = from_timer(priv, t, rr_timer);\n+\tstruct net_device *dev = priv->dev;\n \tstruct grcan_registers __iomem *regs = priv->regs;\n \tunsigned long flags;\n \n@@ -898,10 +898,10 @@ static inline void grcan_reset_timer(struct timer_list *timer, __u32 bitrate)\n }\n \n /* Disable channels and schedule a running reset */\n-static void grcan_initiate_running_reset(unsigned long data)\n+static void grcan_initiate_running_reset(struct timer_list *t)\n {\n-\tstruct net_device *dev = (struct net_device *)data;\n-\tstruct grcan_priv *priv = netdev_priv(dev);\n+\tstruct grcan_priv *priv = from_timer(priv, t, hang_timer);\n+\tstruct net_device *dev = priv->dev;\n \tstruct grcan_registers __iomem *regs = priv->regs;\n \tunsigned long flags;\n \n@@ -1626,11 +1626,8 @@ static int grcan_setup_netdev(struct platform_device *ofdev,\n \tspin_lock_init(&priv->lock);\n \n \tif (priv->need_txbug_workaround) {\n-\t\tsetup_timer(&priv->rr_timer, grcan_running_reset,\n-\t\t\t (unsigned long)dev);\n-\n-\t\tsetup_timer(&priv->hang_timer, grcan_initiate_running_reset,\n-\t\t\t (unsigned long)dev);\n+\t\ttimer_setup(&priv->rr_timer, grcan_running_reset, 0);\n+\t\ttimer_setup(&priv->hang_timer, grcan_initiate_running_reset, 0);\n \t}\n \n \tnetif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);\ndiff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c\nindex 4b8758e10bd4..485b19c9ae47 100644\n--- a/drivers/net/can/sja1000/peak_pcmcia.c\n+++ b/drivers/net/can/sja1000/peak_pcmcia.c\n@@ -381,9 +381,9 @@ static inline void pcan_set_can_power(struct pcan_pccard *card, int onoff)\n /*\n * set leds state according to channel activity\n */\n-static void pcan_led_timer(unsigned long arg)\n+static void pcan_led_timer(struct timer_list *t)\n {\n-\tstruct pcan_pccard *card = (struct pcan_pccard *)arg;\n+\tstruct pcan_pccard *card = from_timer(card, t, led_timer);\n \tstruct net_device *netdev;\n \tint i, up_count = 0;\n \tu8 ccr;\n@@ -692,7 +692,7 @@ static int pcan_probe(struct pcmcia_device *pdev)\n \t}\n \n \t/* init the timer which controls the leds */\n-\tsetup_timer(&card->led_timer, pcan_led_timer, (unsigned long)card);\n+\ttimer_setup(&card->led_timer, pcan_led_timer, 0);\n \n \t/* request the given irq */\n \terr = request_irq(pdev->irq, &pcan_isr, IRQF_SHARED, PCC_NAME, card);\ndiff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c\nindex 7e10dbdded28..25a9b79cc42d 100644\n--- a/drivers/net/can/usb/peak_usb/pcan_usb.c\n+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c\n@@ -259,10 +259,13 @@ static int pcan_usb_write_mode(struct peak_usb_device *dev, u8 onoff)\n /*\n * handle end of waiting for the device to reset\n */\n-static void pcan_usb_restart(unsigned long arg)\n+static void pcan_usb_restart(struct timer_list *t)\n {\n+\tstruct pcan_usb *pdev = from_timer(pdev, t, restart_timer);\n+\tstruct peak_usb_device *dev = &pdev->dev;\n+\n \t/* notify candev and netdev */\n-\tpeak_usb_restart_complete((struct peak_usb_device *)arg);\n+\tpeak_usb_restart_complete(dev);\n }\n \n /*\n@@ -798,8 +801,7 @@ static int pcan_usb_init(struct peak_usb_device *dev)\n \tint err;\n \n \t/* initialize a timer needed to wait for hardware restart */\n-\tsetup_timer(&pdev->restart_timer, pcan_usb_restart,\n-\t\t (unsigned long)dev);\n+\ttimer_setup(&pdev->restart_timer, pcan_usb_restart, 0);\n \n \t/*\n \t * explicit use of dev_xxx() instead of netdev_xxx() here:\n","prefixes":[]}