{"id":830234,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830234/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105353.GA146631@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":"<20171025105353.GA146631@beast>","list_archive_url":null,"date":"2017-10-25T10:53:53","name":"drivers/net: wan/lmc: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"c78899dda42b4239e8ac884659ea71f4fd8b8157","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/20171025105353.GA146631@beast/mbox/","series":[{"id":10143,"url":"http://patchwork.ozlabs.org/api/1.2/series/10143/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10143","date":"2017-10-25T10:53:53","name":"drivers/net: wan/lmc: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10143/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830234/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830234/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=\"N+w49NV2\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRqX020qz9sNx\n\tfor ;\n\tWed, 25 Oct 2017 21:55:04 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932669AbdJYKx7 (ORCPT );\n\tWed, 25 Oct 2017 06:53:59 -0400","from mail-pg0-f67.google.com ([74.125.83.67]:55398 \"EHLO\n\tmail-pg0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932514AbdJYKxz (ORCPT\n\t); Wed, 25 Oct 2017 06:53:55 -0400","by mail-pg0-f67.google.com with SMTP id 15so12322881pgc.12\n\tfor ; Wed, 25 Oct 2017 03:53:55 -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\tc184sm5144890pfg.35.2017.10.25.03.53.53\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:53:54 -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=5AcYd8i7fOXFuWLISU4dmY/ftqLAEhD4NgYZw5ezTM4=;\n\tb=N+w49NV2SAPE4so86Q3RK3fyzM6KtD3bGiWQsUb34vlmS/d3B+FTU5FTYOhuQOnNU/\n\tXrBwhXkPQI46zbA93YXGJXcUOtJEfwmeItRYAh3JKl3tkjZU14RPEfCf9PGOMpUUwwTS\n\t9Vz+abZA+Z+qOIURroANfkKQBXZC8RMaeqXhI=","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=5AcYd8i7fOXFuWLISU4dmY/ftqLAEhD4NgYZw5ezTM4=;\n\tb=n2Ygo7IcKrxNcTTGR4sQTpvmXu6qI6P7Ah5Yw5Z0dq4DXK+W0J5J5GE/wG2nPUdQWf\n\teeLGZ7qQuCkRTX4IBdRtRlM31N0PZ8UI1WbKNvGd4Seulo2UyjA2eiG6XAsCJTs9+84I\n\tXpIhfGtcGHTAxzPHcSucgdBf1FnwPdwfTQLuHxSIMfvK6FMLh505T2XCc6x2FaggIXvQ\n\tQON4uaGgy8tPWvXkqOykLiD7PJhdDFxAeuVPMFIXnp33IdksXIBQXPGpXMFT9hVccj0P\n\tAWQivg3yrxtExMikx5RAPuGpOIEgy3OgYOyWXYg+OR8167MAITbGEUa2U6xeZW6bfOr2\n\t3LXg==","X-Gm-Message-State":"AMCzsaUmTwD+Vsk7HO2vErhEv5J0J0PAvr+UzqIacUx6oULGy5uAZ0yq\n\tpzkq2msy4xea9rgMtlZFPMl2Yw==","X-Google-Smtp-Source":"ABhQp+RNxmIAkMqCts/8WGn7OFDJQaXCz3Hj+dBDin8OMGh7qgVvyoV92oZihlUucVTLp3/oM+w4vw==","X-Received":"by 10.84.234.197 with SMTP id i5mr1448959plt.316.1508928835202; \n\tWed, 25 Oct 2017 03:53:55 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:53:53 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Allen Pais , netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: wan/lmc: Convert timers to use timer_setup()","Message-ID":"<20171025105353.GA146631@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: Allen Pais \nCc: \"David S. Miller\" \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/wan/lmc/lmc_main.c | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c\nindex ae69d65158e6..37b1e0d03e31 100644\n--- a/drivers/net/wan/lmc/lmc_main.c\n+++ b/drivers/net/wan/lmc/lmc_main.c\n@@ -99,7 +99,7 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, size_t c\n static void lmc_softreset(lmc_softc_t * const);\n static void lmc_running_reset(struct net_device *dev);\n static int lmc_ifdown(struct net_device * const);\n-static void lmc_watchdog(unsigned long data);\n+static void lmc_watchdog(struct timer_list *t);\n static void lmc_reset(lmc_softc_t * const sc);\n static void lmc_dec_reset(lmc_softc_t * const sc);\n static void lmc_driver_timeout(struct net_device *dev);\n@@ -636,10 +636,10 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/\n \n \n /* the watchdog process that cruises around */\n-static void lmc_watchdog (unsigned long data) /*fold00*/\n+static void lmc_watchdog(struct timer_list *t) /*fold00*/\n {\n- struct net_device *dev = (struct net_device *)data;\n- lmc_softc_t *sc = dev_to_sc(dev);\n+ lmc_softc_t *sc = from_timer(sc, t, timer);\n+ struct net_device *dev = sc->lmc_device;\n int link_status;\n u32 ticks;\n unsigned long flags;\n@@ -1084,7 +1084,7 @@ static int lmc_open(struct net_device *dev)\n * Setup a timer for the watchdog on probe, and start it running.\n * Since lmc_ok == 0, it will be a NOP for now.\n */\n- setup_timer(&sc->timer, lmc_watchdog, (unsigned long)dev);\n+ timer_setup(&sc->timer, lmc_watchdog, 0);\n sc->timer.expires = jiffies + HZ;\n add_timer (&sc->timer);\n \n","prefixes":[]}