[{"id":1793725,"web_url":"http://patchwork.ozlabs.org/comment/1793725/","msgid":"<7bfcf28f-749c-8b7a-a999-54054d15c766@gmail.com>","list_archive_url":null,"date":"2017-10-25T12:58:41","subject":"Re: [PATCH] drivers/net: hippi: Convert timers to use timer_setup()","submitter":{"id":70353,"url":"http://patchwork.ozlabs.org/api/people/70353/","name":"Jes Sorensen","email":"jes.sorensen@gmail.com"},"content":"On 10/25/2017 06:51 AM, Kees Cook wrote:\n> In preparation for unconditionally passing the struct timer_list pointer to\n> all timer callbacks, switch to using the new timer_setup() and from_timer()\n> to pass the timer pointer explicitly.\n> \n> Cc: Jes Sorensen \n> Cc: linux-hippi@sunsite.dk\n> Cc: netdev@vger.kernel.org\n> Signed-off-by: Kees Cook \n> ---\n> drivers/net/hippi/rrunner.c | 8 ++++----\n> 1 file changed, 4 insertions(+), 4 deletions(-)\n\nLooks good to me.\n\nJes\n\n> diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c\n> index 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>","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 (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"ZDsBXATI\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMVZb3rFkz9t38\n\tfor ;\n\tWed, 25 Oct 2017 23:59:03 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750981AbdJYM6q (ORCPT );\n\tWed, 25 Oct 2017 08:58:46 -0400","from mail-yw0-f196.google.com ([209.85.161.196]:49161 \"EHLO\n\tmail-yw0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750765AbdJYM6o (ORCPT\n\t); Wed, 25 Oct 2017 08:58:44 -0400","by mail-yw0-f196.google.com with SMTP id z195so11439837ywz.6;\n\tWed, 25 Oct 2017 05:58:43 -0700 (PDT)","from ?IPv6:2620:10d:c0a3:10fb:a464:42a6:e226:d387?\n\t([2620:10d:c091:200::9104]) by smtp.gmail.com with ESMTPSA id\n\tm8sm1289214ywd.30.2017.10.25.05.58.42\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 05:58:42 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:subject:to:cc:references:message-id:date:user-agent\n\t:mime-version:in-reply-to:content-language:content-transfer-encoding; \n\tbh=IfJ+QRF+/7VsxbmFyks9it/PjzXbqBJt/50uK0P6Ar0=;\n\tb=ZDsBXATIdqHRuc86Zw+EethXcbMzOYcFpb5nyFPJug08PIv3Zvhc/WJPCdaIaL9kBO\n\t7DKTkwW99kBvYQwfJyXLzLkyciuQi++7ukMpva/4hqACR/sefo53lYhTfm/ouYH9E9F9\n\t467grik8f1Yh+tvtRPGovc9ffADyA1spmvmNJYAUVIfdcPwp8BUGJQt+APcrU+xJ3isO\n\tscPVHBrwE/IrKUiRLxICwqVdnPkkJakHq/i65Umj2GlHXNLSZTtiKa+cU6VdVwcU2/K8\n\t7jU45vd6FFnE0WqFlk18FiMBrkm3b7ksZ1EvfuFtjffK3c9ZO9qZ93s3ulQFGlZmPGzQ\n\t+kRg==","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:subject:to:cc:references:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=IfJ+QRF+/7VsxbmFyks9it/PjzXbqBJt/50uK0P6Ar0=;\n\tb=HxbtLuvYfvkHCW3nerRS6o7DflsH/4x6XbMHGiVUZCfRpuT8O1Hc0HtwHzN1tEztBa\n\tAODj0vmippMmefeJ3I5WWbnuEXA3M7Fsv5c6v2G2fRTiNs8O72t5UvM8uYegZNvkpZxE\n\ta9lb0KHs6gw1OvNdz/lBSKl4pw2rdVNjNhXmZzxWvFPUL9vu5c05CjK8sT62lScJjXL3\n\t7Y7k5i2QmHtTzJNEjf+8po5xhhqTUjeEXrs9Ti1C5Y+E0cb1e7/uONQU6lnxRY78lTcb\n\tqSXhFrPXvoShXqK0ZSmoxQd4aY/NZIzh1K6Gvx0B5iWLlcGYquYdebrt/EHDkUWuGPaD\n\tEW2g==","X-Gm-Message-State":"AMCzsaWfxyYdZhqv3RjQ+pnldXuFcKAzY+e4uUFkmGjEDobL4s69ncIR\n\tB89UBTNd8LHMqn5s5AvGnM9OEAer","X-Google-Smtp-Source":"ABhQp+SGRRR/asVpgGo0KPdpM1KIAfgjCyXfKHt10lXOq1YHvj01u5swYMN0+ubX5B5WghciYQt3Rg==","X-Received":"by 10.13.254.193 with SMTP id o184mr12877212ywf.38.1508936323217;\n\tWed, 25 Oct 2017 05:58:43 -0700 (PDT)","From":"Jes Sorensen ","X-Google-Original-From":"Jes Sorensen ","Subject":"Re: [PATCH] drivers/net: hippi: Convert timers to use timer_setup()","To":"Kees Cook ,\n\t\"David S. Miller\" ","Cc":"Jes Sorensen , linux-hippi@sunsite.dk,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","References":"<20171025105129.GA146547@beast>","Message-ID":"<7bfcf28f-749c-8b7a-a999-54054d15c766@gmail.com>","Date":"Wed, 25 Oct 2017 08:58:41 -0400","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20171025105129.GA146547@beast>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}},{"id":1794581,"web_url":"http://patchwork.ozlabs.org/comment/1794581/","msgid":"<20171027.120950.1895762684750742049.davem@davemloft.net>","list_archive_url":null,"date":"2017-10-27T03:09:50","subject":"Re: [PATCH] drivers/net: hippi: Convert timers to use timer_setup()","submitter":{"id":15,"url":"http://patchwork.ozlabs.org/api/people/15/","name":"David Miller","email":"davem@davemloft.net"},"content":"From: Kees Cook \nDate: Wed, 25 Oct 2017 03:51:29 -0700\n\n> In preparation for unconditionally passing the struct timer_list pointer to\n> all timer callbacks, switch to using the new timer_setup() and from_timer()\n> to pass the timer pointer explicitly.\n> \n> Cc: Jes Sorensen \n> Cc: linux-hippi@sunsite.dk\n> Cc: netdev@vger.kernel.org\n> Signed-off-by: Kees Cook \n\nApplied.","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNTQ152rmz9t30\n\tfor ;\n\tFri, 27 Oct 2017 14:10:01 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752140AbdJ0DJ6 (ORCPT );\n\tThu, 26 Oct 2017 23:09:58 -0400","from shards.monkeyblade.net ([184.105.139.130]:43684 \"EHLO\n\tshards.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751685AbdJ0DJx (ORCPT\n\t); Thu, 26 Oct 2017 23:09:53 -0400","from localhost (unknown [211.196.191.92])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(Client did not present a certificate)\n\t(Authenticated sender: davem-davemloft)\n\tby shards.monkeyblade.net (Postfix) with ESMTPSA id DCCA41340112D;\n\tThu, 26 Oct 2017 20:09:51 -0700 (PDT)"],"Date":"Fri, 27 Oct 2017 12:09:50 +0900 (KST)","Message-Id":"<20171027.120950.1895762684750742049.davem@davemloft.net>","To":"keescook@chromium.org","Cc":"jes@trained-monkey.org, linux-hippi@sunsite.dk,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"Re: [PATCH] drivers/net: hippi: Convert timers to use timer_setup()","From":"David Miller ","In-Reply-To":"<20171025105129.GA146547@beast>","References":"<20171025105129.GA146547@beast>","X-Mailer":"Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO)","Mime-Version":"1.0","Content-Type":"Text/Plain; charset=us-ascii","Content-Transfer-Encoding":"7bit","X-Greylist":"Sender succeeded SMTP AUTH, not delayed by\n\tmilter-greylist-4.5.12 (shards.monkeyblade.net\n\t[149.20.54.216]); Thu, 26 Oct 2017 20:09:53 -0700 (PDT)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]