{"id":831101,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831101/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027055513.GA115294@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":"<20171027055513.GA115294@beast>","list_archive_url":null,"date":"2017-10-27T05:55:13","name":"drivers/net: korina: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"6b7f02120f54e4ba8e305223801f35aee58ab183","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/20171027055513.GA115294@beast/mbox/","series":[{"id":10507,"url":"http://patchwork.ozlabs.org/api/1.2/series/10507/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10507","date":"2017-10-27T05:55:13","name":"drivers/net: korina: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10507/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831101/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831101/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=\"aw2jxVXL\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNY842qGbz9t2Q\n\tfor ;\n\tFri, 27 Oct 2017 16:58:12 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752137AbdJ0FzT (ORCPT );\n\tFri, 27 Oct 2017 01:55:19 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:45904 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752128AbdJ0FzQ (ORCPT\n\t); Fri, 27 Oct 2017 01:55:16 -0400","by mail-pg0-f68.google.com with SMTP id b192so4524457pga.2\n\tfor ; Thu, 26 Oct 2017 22:55:15 -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\tu46sm10283253pgn.80.2017.10.26.22.55.14\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 26 Oct 2017 22:55:14 -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=+dceDkHCX07RJfxbIY7jnz0YIldPLxzPxie737YQmBs=;\n\tb=aw2jxVXLDonYCPw8YLIf5FlW9FsFpp6luIYhqs9TGRcx7f4J/vjO6Ed/Y3i5Dn9zdV\n\tSrERx86CgKKP1z6dL2AIE3RnwlcbNja6lSzmOb6gZTrqc6ErbKdQk0U9VeN4cz5WdZtI\n\tj7xAeGR72XLcYrB3zgJ8+AQW9H0ZoJEFvfzrc=","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=+dceDkHCX07RJfxbIY7jnz0YIldPLxzPxie737YQmBs=;\n\tb=B0Iw6ug6aQN2NY32AP2UopaGyRN8DnEHRPHbDdyDnjRLmYdwFckGsrO467CpPDjEOU\n\tISdvE6rAIV1BsZka25X02ZwxT3S87LwLikNwrn5sZUmOOuI+2YVnxIquzSenmR13Ahk6\n\tAEnc0XO6R65Q1njljYS2wiTDNCW9F0E5mTYSpFBEn6EHGXgmetk92bjgmeQCi3sN/v59\n\tu0SlM1y1VNCRi7KStGGuWH5GGtDFSZLOi3N3HLAekD3Da5BGhnY7IskZ/OuBM5/nQEhm\n\tQ5qJninXUpXyyhzwCsamR50Cj4znIhDjOGP2vHtxzyzbfZJZN78b3sKsLEc5lHHt5V/h\n\tgXFQ==","X-Gm-Message-State":"AMCzsaVSO4WlitYw2eaxoU5aOSYD6cJ7su7dITnSze7mIR4oI2NAZTRk\n\tPjH3LPgTd3ix+9TSdD+F1WX2nQ==","X-Google-Smtp-Source":"ABhQp+RDsVRxjTvP5ZwGKYMWv/TxAy+KDhJ1+2s/tfGIwxLNj2JS3zdd40i8vE25olUPkjjI01LOvg==","X-Received":"by 10.98.60.211 with SMTP id b80mr7749387pfk.4.1509083715524;\n\tThu, 26 Oct 2017 22:55:15 -0700 (PDT)","Date":"Thu, 26 Oct 2017 22:55:13 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Roman Yeryomin ,\n\tFlorian Fainelli ,\n\tnetdev@vger.kernel.org, linux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: korina: Convert timers to use timer_setup()","Message-ID":"<20171027055513.GA115294@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: Roman Yeryomin \nCc: Florian Fainelli \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/ethernet/korina.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c\nindex 7cecd9dbc111..ae195f8adff5 100644\n--- a/drivers/net/ethernet/korina.c\n+++ b/drivers/net/ethernet/korina.c\n@@ -653,10 +653,10 @@ static void korina_check_media(struct net_device *dev, unsigned int init_media)\n \t\t\t\t\t\t&lp->eth_regs->ethmac2);\n }\n \n-static void korina_poll_media(unsigned long data)\n+static void korina_poll_media(struct timer_list *t)\n {\n-\tstruct net_device *dev = (struct net_device *) data;\n-\tstruct korina_private *lp = netdev_priv(dev);\n+\tstruct korina_private *lp = from_timer(lp, t, media_check_timer);\n+\tstruct net_device *dev = lp->dev;\n \n \tkorina_check_media(dev, 0);\n \tmod_timer(&lp->media_check_timer, jiffies + HZ);\n@@ -1103,7 +1103,7 @@ static int korina_probe(struct platform_device *pdev)\n \t\t\t\": cannot register net device: %d\\n\", rc);\n \t\tgoto probe_err_register;\n \t}\n-\tsetup_timer(&lp->media_check_timer, korina_poll_media, (unsigned long) dev);\n+\ttimer_setup(&lp->media_check_timer, korina_poll_media, 0);\n \n \tINIT_WORK(&lp->restart_task, korina_restart_task);\n \n","prefixes":[]}