{"id":830235,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830235/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171025105342.GA146617@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":"<20171025105342.GA146617@beast>","list_archive_url":null,"date":"2017-10-25T10:53:42","name":"drivers/net: wan/dscc4: Remove unused timer","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"7d9de99978d961c96957e0c50f61132fe098c173","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/20171025105342.GA146617@beast/mbox/","series":[{"id":10144,"url":"http://patchwork.ozlabs.org/api/1.2/series/10144/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10144","date":"2017-10-25T10:53:42","name":"drivers/net: wan/dscc4: Remove unused timer","version":1,"mbox":"http://patchwork.ozlabs.org/series/10144/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830235/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830235/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=\"oZijFhgA\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yMRql3LLtz9sPm\n\tfor ;\n\tWed, 25 Oct 2017 21:55:15 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932583AbdJYKxt (ORCPT );\n\tWed, 25 Oct 2017 06:53:49 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:53855 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932458AbdJYKxp (ORCPT\n\t); Wed, 25 Oct 2017 06:53:45 -0400","by mail-pf0-f194.google.com with SMTP id t188so21951515pfd.10\n\tfor ; Wed, 25 Oct 2017 03:53:44 -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\to128sm4752518pfg.118.2017.10.25.03.53.42\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 25 Oct 2017 03:53:43 -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=TFMod6a7LTUGtSZjBeDUZ7kB01+4/KR9QcqUb6r7sBI=;\n\tb=oZijFhgApulqBnhhRwFjumUKU4PJp7Enj0g2d7oBjYsLQ6bZp42gLs3pa596lJuze9\n\ttzK0bqQN+F+kJpnM1SjQVhQILC2RbUoB93EXZM3Me1Ygh7dpFSHNZCgKJi+RFkpHCa6X\n\tS2Eg5DHkUTROKg+L++BWiI32dz8pgtDM1/Tbs=","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=TFMod6a7LTUGtSZjBeDUZ7kB01+4/KR9QcqUb6r7sBI=;\n\tb=A09ZYIEFMsu0kE2nLTxre0IRWjGFw6LPrCMcT+tyVr1g2wiij4LWoYKCMxapmnzuRo\n\tZCUrm5QVx06edCTPTW86xluNrfAWHpHIdx5r56Np6BUzFYqdUzI36+J6vOjLga3Mcw0g\n\tMCbKlZ404XuR/MaiAkNJsVyKWgvum1PrLd++/yHEiwW7axDN6pkkDJLEYxXK1yk3sZMH\n\tNVNGjz+6HAvJf9lohKZMwh27qLJNBoGo5/KpwWG/rADXzm3pt86Ufpe2/M53gkdyu/nD\n\tr+5GdSmWLT7O+dDAR12KPN8rGrHeiBqADbLCT+0U8G6Gw+i9hLuBZWewgvPnuCxaQzWw\n\tY1XQ==","X-Gm-Message-State":"AMCzsaW6eRsYt+BhWBX4PNYLmRKoXgYzWI/49twQAGEm8cFkNF95BiIf\n\tEfIkYeRg2Uv1UuFoz/9HNF81fA==","X-Google-Smtp-Source":"ABhQp+RyZO4wL+ag8Rf5OHX5v1vy1nrKOtdxLvEv/0y1m/RDSySDrCocAa2pQZ2OGPVyvABgefHgww==","X-Received":"by 10.99.109.75 with SMTP id i72mr1662443pgc.268.1508928824105; \n\tWed, 25 Oct 2017 03:53:44 -0700 (PDT)","Date":"Wed, 25 Oct 2017 03:53:42 -0700","From":"Kees Cook ","To":"\"David S. Miller\" ","Cc":"Francois Romieu , netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org","Subject":"[PATCH] drivers/net: wan/dscc4: Remove unused timer","Message-ID":"<20171025105342.GA146617@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":"This removes an entirely unused timer, which avoids needing to convert it\nto timer_setup().\n\nCc: Francois Romieu \nCc: netdev@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n drivers/net/wan/dscc4.c | 20 --------------------\n 1 file changed, 20 deletions(-)","diff":"diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c\nindex 64f176496da4..c0b0f525c87c 100644\n--- a/drivers/net/wan/dscc4.c\n+++ b/drivers/net/wan/dscc4.c\n@@ -223,8 +223,6 @@ struct dscc4_dev_priv {\n \n \tu32 scc_regs[SCC_REGISTERS_MAX]; /* Cf errata DS5 p.4 */\n \n-\tstruct timer_list timer;\n-\n struct dscc4_pci_priv *pci_priv;\n spinlock_t lock;\n \n@@ -369,7 +367,6 @@ static int dscc4_close(struct net_device *);\n static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);\n static int dscc4_init_ring(struct net_device *);\n static void dscc4_release_ring(struct dscc4_dev_priv *);\n-static void dscc4_timer(unsigned long);\n static void dscc4_tx_timeout(struct net_device *);\n static irqreturn_t dscc4_irq(int irq, void *dev_id);\n static int dscc4_hdlc_attach(struct net_device *, unsigned short, unsigned short);\n@@ -983,19 +980,6 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)\n \treturn ret;\n };\n \n-/* FIXME: get rid of the unneeded code */\n-static void dscc4_timer(unsigned long data)\n-{\n-\tstruct net_device *dev = (struct net_device *)data;\n-\tstruct dscc4_dev_priv *dpriv = dscc4_priv(dev);\n-//\tstruct dscc4_pci_priv *ppriv;\n-\n-\tgoto done;\n-done:\n- dpriv->timer.expires = jiffies + TX_TIMEOUT;\n- add_timer(&dpriv->timer);\n-}\n-\n static void dscc4_tx_timeout(struct net_device *dev)\n {\n \t/* FIXME: something is missing there */\n@@ -1127,9 +1111,6 @@ static int dscc4_open(struct net_device *dev)\n done:\n \tnetif_start_queue(dev);\n \n-\tsetup_timer(&dpriv->timer, dscc4_timer, (unsigned long)dev);\n- dpriv->timer.expires = jiffies + 10*HZ;\n- add_timer(&dpriv->timer);\n \tnetif_carrier_on(dev);\n \n \treturn 0;\n@@ -1197,7 +1178,6 @@ static int dscc4_close(struct net_device *dev)\n {\n \tstruct dscc4_dev_priv *dpriv = dscc4_priv(dev);\n \n-\tdel_timer_sync(&dpriv->timer);\n \tnetif_stop_queue(dev);\n \n \tscc_patchl(PowerUp | Vis, 0, dpriv, dev, CCR0);\n","prefixes":[]}