{"id":830232,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830232/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105359.GA146645@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":"<20171025105359.GA146645@beast>","list_archive_url":null,"date":"2017-10-25T10:53:59","name":"drivers/net: wan/sdla: Convert timers to use timer_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"83165ba3375aac4b3758c4de6ac7d9c340abadbc","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/20171025105359.GA146645@beast/mbox/","series":[{"id":10141,"url":"http://patchwork.ozlabs.org/api/1.2/series/10141/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10141","date":"2017-10-25T10:53:59","name":"drivers/net: wan/sdla: Convert timers to use timer_setup()","version":1,"mbox":"http://patchwork.ozlabs.org/series/10141/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830232/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830232/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=\"PPSiI0FI\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRpT2rz0z9sNx\n\tfor ;\n\tWed, 25 Oct 2017 21:54:09 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932697AbdJYKyH (ORCPT );\n\tWed, 25 Oct 2017 06:54:07 -0400","from mail-pg0-f68.google.com ([74.125.83.68]:44950 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932422AbdJYKyC (ORCPT\n\t); Wed, 25 Oct 2017 06:54:02 -0400","by mail-pg0-f68.google.com with SMTP id j3so17020276pga.1\n\tfor ; Wed, 25 Oct 2017 03:54:02 -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\te18sm4499727pfi.57.2017.10.25.03.54.00\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:54:00 -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=l95+ZDQ0gZFEYwGtMMBvDTCu47M0h1/hcHHOdDsf5Sg=;\n\tb=PPSiI0FI17H8pgjNxOcmukHwtiRyyookyfbxzPa06Bpk9sM9+OH44UMz4NtO+VIDiY\n\tPnEWQ2P0iAoC32qGCdsdEOlfHB4hNqdpVoVM/gb+uIp05dgoi5XJuNRxX1S0ZdbJeQti\n\tet9Hxjbc7RrKbZQPenzjTeBzyNGUrVBRiqybY=","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=l95+ZDQ0gZFEYwGtMMBvDTCu47M0h1/hcHHOdDsf5Sg=;\n\tb=S8u7hAMIjfLw6WU85PaLhpuCqbjPv1U95wOquPz7Je4mYvMxTMk1FbBA4O9DcyvfuS\n\t/CBgNEEQfRqIP+GmDs3u7ypYXVbtjLtw3vjrQZoaYYh0xRd2AuPkdbdtAIeHYXTcOPdc\n\tlOYHEcF59T8FQZ5zj1WxqCe4rVOLqw85e7oWNJ7bjiBVv/8AkL7FGG2nfpW0zjnBKLto\n\tC8c6IMBkSxZ/l5/WOxl5MlMEXOi0LZyIl/i/KFKmMGV6jtr0OLKV9xOrmHT+eLeEUyVJ\n\t128adhEUflvOs7NkvB547DDTLOYUbUY8A6rDVlUfPXgZrW+nva8BUagm3lT5P0ZlXz3T\n\tAsFQ==","X-Gm-Message-State":"AMCzsaVRcouHCvzdW8uc7h5fzaVjoJvkE/q5ObthLpAY+IGB36xyvueG\n\tJBsfXeZlhyoJZ2VZzy39VEjqpA==","X-Google-Smtp-Source":"ABhQp+Ts8dNPTtLrWPA1OqApdrnev2TOtlyFiOrmQBZQ/M/oImYg02YYJbuLjp7zB+DbBLo9x3PdZA==","X-Received":"by 10.99.160.25 with SMTP id r25mr1610796pge.67.1508928842042;\n\tWed, 25 Oct 2017 03:54:02 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:53:59 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Allen Pais ,\n\tTobias Klauser , netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: wan/sdla: Convert timers to use timer_setup()","Message-ID":"<20171025105359.GA146645@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: Tobias Klauser \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/wan/sdla.c | 12 +++++-------\n include/linux/if_frad.h | 1 +\n 2 files changed, 6 insertions(+), 7 deletions(-)","diff":"diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c\nindex 0cc48902dbb9..57ed259c8208 100644\n--- a/drivers/net/wan/sdla.c\n+++ b/drivers/net/wan/sdla.c\n@@ -927,13 +927,10 @@ static irqreturn_t sdla_isr(int dummy, void *dev_id)\n \treturn IRQ_HANDLED;\n }\n \n-static void sdla_poll(unsigned long device)\n+static void sdla_poll(struct timer_list *t)\n {\n-\tstruct net_device\t *dev;\n-\tstruct frad_local *flp;\n-\n-\tdev = (struct net_device *) device;\n-\tflp = netdev_priv(dev);\n+\tstruct frad_local *flp = from_timer(flp, t, timer);\n+\tstruct net_device *dev = flp->dev;\n \n \tif (sdla_byte(dev, SDLA_502_RCV_BUF))\n \t\tsdla_receive(dev);\n@@ -1616,8 +1613,9 @@ static void setup_sdla(struct net_device *dev)\n \tflp->assoc\t\t= sdla_assoc;\n \tflp->deassoc\t\t= sdla_deassoc;\n \tflp->dlci_conf\t\t= sdla_dlci_conf;\n+\tflp->dev\t\t= dev;\n \n-\tsetup_timer(&flp->timer, sdla_poll, (unsigned long)dev);\n+\ttimer_setup(&flp->timer, sdla_poll, 0);\n \tflp->timer.expires\t= 1;\n }\n \ndiff --git a/include/linux/if_frad.h b/include/linux/if_frad.h\nindex 46df7e565d6f..82a1b4e93570 100644\n--- a/include/linux/if_frad.h\n+++ b/include/linux/if_frad.h\n@@ -83,6 +83,7 @@ struct frad_local\n \n /* fields that are used by the Sangoma SDLA cards */\n struct timer_list timer;\n+ struct net_device *dev;\n int type;\t\t/* adapter type */\n int state;\t\t/* state of the S502/8 control latch */\n int buffer;\t\t/* current buffer for S508 firmware */\n","prefixes":[]}