Message ID | 1508200182-104605-40-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="HHxdrkOf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yGGd10RWLz9s7g for <patchwork-incoming@ozlabs.org>; Tue, 17 Oct 2017 11:43:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758112AbdJQAh2 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 16 Oct 2017 20:37:28 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:56900 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756715AbdJQAh0 (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 16 Oct 2017 20:37:26 -0400 Received: by mail-pf0-f170.google.com with SMTP id b85so43381pfj.13 for <netdev@vger.kernel.org>; Mon, 16 Oct 2017 17:37:26 -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=m2B41u6h9gWbjjyxZ/l3jlI5tETm55bX6Tqmwkndzik=; b=HHxdrkOfQeACUP5GV537qX/i0gnq9dmuGvd4Sojt7PBBl1ST61Rb2syz915DSSOeZC baKjQc0TIrdRhoLnYZ9HoMSVwNWlOqekuU8wTB5l1GdosyeZZJ/VEvUK9q6T1Q/K2jBs O3rDaky2e7dJBbCgk3TdtWte/2CwWNUwDscLk= 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=m2B41u6h9gWbjjyxZ/l3jlI5tETm55bX6Tqmwkndzik=; b=e5Y5dOFyJu7f3O+N7jGWShtV0WuHFkmJeOtKqFV62TLu1bh/IRR1SuHJB9jR9660f/ V2AGpVYIN2aq2B4eQYLtZXqv7SvZLer7fhoastprH+xN95mgXpE5/BpPV6Pj7LdK24SK +jrYA3Wex4iT7BtRCrk3UbZdlRC0WjXZ5zFFThQmo3vW1p6gSYyiZqBk4awc3kxpj4xB ELdrsvHLsEKwmkdJRPEBVgdI7F7ZVhPGh7Gpnjg/881cCxlEVQgsg02vSc8qjPXKjBPR 2aW9ZXCndDKEhYgkxl5h9PlpgSBWonMafZ6ka7Ar/RsXy1hes1GBSqv4WAET3RkH1P1Q uNUw== X-Gm-Message-State: AMCzsaU1fYJiNYQBRZMNDQEyBIOm0Rnrq6asO4BgLSjUGQgs4U7YPLGC O7MT6Kok9eds32UtvR6zRjksAA== X-Google-Smtp-Source: AOwi7QDPPpfkG+v+hY4R7UvEb0pX/gGF/8Jj5z6CtpgZXpmFljwtfD5rlFo0hXc+nwBv2xFOGXQR4g== X-Received: by 10.84.171.195 with SMTP id l61mr10238312plb.64.1508200645723; Mon, 16 Oct 2017 17:37:25 -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 z86sm17547676pfk.34.2017.10.16.17.37.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:37:24 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: "David S. Miller" <davem@davemloft.net> Cc: Kees Cook <keescook@chromium.org>, David Howells <dhowells@redhat.com>, netdev@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org Subject: [PATCH 39/58] appletalk: Remove unneeded synchronization Date: Mon, 16 Oct 2017 17:29:23 -0700 Message-Id: <1508200182-104605-40-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/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index e4aa374caa4d..cc3dc9337eae 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -880,14 +880,10 @@ static void ltpc_poll(unsigned long l) } ltpc_poll_counter--; } - - if (!dev) - return; /* we've been downed */ /* poll 20 times per second */ idle(dev); ltpc_timer.expires = jiffies + HZ/20; - add_timer(<pc_timer); } @@ -1252,8 +1248,6 @@ static void __exit ltpc_cleanup(void) if(debug & DEBUG_VERBOSE) printk("unregister_netdev\n"); unregister_netdev(dev_ltpc); - ltpc_timer.data = 0; /* signal the poll routine that we're done */ - del_timer_sync(<pc_timer); if(debug & DEBUG_VERBOSE) printk("freeing irq\n");
The use of del_timer_sync() will make sure a timer is not rescheduled. As such, there is no need to add external signals to kill timers. In preparation for switching the timer callback argument to the timer pointer, this drops the .data argument since it doesn't serve a meaningful purpose here. Cc: David Howells <dhowells@redhat.com> Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/net/appletalk/ltpc.c | 6 ------ 1 file changed, 6 deletions(-)