Message ID | 1508200182-104605-56-git-send-email-keescook@chromium.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RUtTOKzR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGp25GHdz9sP1 for <patchwork-incoming@ozlabs.org>; Tue, 17 Oct 2017 11:50:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523AbdJQAuf (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 16 Oct 2017 20:50:35 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:52346 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933231AbdJQArb (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 16 Oct 2017 20:47:31 -0400 Received: by mail-pg0-f51.google.com with SMTP id a192so67530pge.9 for <netdev@vger.kernel.org>; Mon, 16 Oct 2017 17:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R04wNivOrq+Stsp+/gOy/IiAZS7qcZtBXIaUJ7c1KbY=; b=RUtTOKzRneLqoPl7lDf2bzuCxu10/pCo7TFqQcWzlodVuwMH/ja7tg5tqhI0GScZ9e JsxRCnr2ZNZshhguaqR03XSEX9ZMGctjlF0kfP3D6GdRBgvmtgFh62ZLyHV4IkLZSrJe 5XmKoPIzZ7aLdR6CfAxolx3LE01pS6Ey97TKw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R04wNivOrq+Stsp+/gOy/IiAZS7qcZtBXIaUJ7c1KbY=; b=M307Zj2/tWsX7ueUgGHK+Lz5ZPBLmd49zqAgNIgtIAS9uO1v6BZHn6U9FU0mftp4h9 XCdx8LhUyPw09maBY+WTB95qCzvS8GWRV6HJLH+2xUPorQi6arTstJ2HImklA1NbCaI1 wdhMt2KaF8sJnAmPiZ6HF2cakxyngEDml6MlQzEDeGCTtEyF/CP75041HN8a7UhGfmrL qyJckqP9toG0pwwgWMNwbFlWgVM8Ll2wiaRx3NtNl3BRXyjEXpGub1II7eGQCZMPJTQe Yl/z0DkwDL1Ge9ngaexgEFZT57Q3Ij1RB0+vmNIdgqjWwrDyUx76kEWtUQ4qcwakFiFI It1Q== X-Gm-Message-State: AMCzsaW0/Q49PofQAu+N4YRrG0+Hg8TSp20HAfFFR4vSl/ugOmSQcluP clFs7d2KB1X3QxLYrp9C6OkyqA== X-Google-Smtp-Source: AOwi7QBx+SJNzH1QZEzjbddXeowgQdcCCkXAnzn2ogYFDABZi+HB3fWcSSeILAHmGJxeHCwDpUW0YQ== X-Received: by 10.98.69.134 with SMTP id n6mr10399122pfi.245.1508201251004; Mon, 16 Oct 2017 17:47:31 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id g24sm17154883pfk.0.2017.10.16.17.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:47:29 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, Pantelis Antoniou <pantelis.antoniou@gmail.com>, Vitaly Bordug <vbordug@ru.mvista.com>, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 55/58] net: fs_enet: Remove unused timer Date: Mon, 16 Oct 2017 17:29:39 -0700 Message-Id: <1508200182-104605-56-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508200182-104605-1-git-send-email-keescook@chromium.org> References: <1508200182-104605-1-git-send-email-keescook@chromium.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
networking: Convert timers to use timer_setup()
|
expand
|
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index 753259091b22..7892f2f0c6b5 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -1023,8 +1023,6 @@ static int fs_enet_probe(struct platform_device *ofdev) ndev->ethtool_ops = &fs_ethtool_ops; - init_timer(&fep->phy_timer_list); - netif_carrier_off(ndev); ndev->features |= NETIF_F_SG; diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h index 5ce516c8a62a..dd306deb7cf1 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h @@ -137,7 +137,6 @@ struct fs_enet_private { cbd_t __iomem *cur_rx; cbd_t __iomem *cur_tx; int tx_free; - struct timer_list phy_timer_list; const struct phy_info *phy; u32 msg_enable; struct mii_if_info mii_if;
Removes unused timer and its old initialization call. Cc: Pantelis Antoniou <pantelis.antoniou@gmail.com> Cc: Vitaly Bordug <vbordug@ru.mvista.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 -- drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 - 2 files changed, 3 deletions(-)