From patchwork Sat Jan 19 20:48:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1028049 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Oax/+Ix0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hqkp2bwKz9sDn for ; Sun, 20 Jan 2019 07:52:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729325AbfASUw2 (ORCPT ); Sat, 19 Jan 2019 15:52:28 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43812 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfASUw2 (ORCPT ); Sat, 19 Jan 2019 15:52:28 -0500 Received: by mail-wr1-f65.google.com with SMTP id r10so18983305wrs.10 for ; Sat, 19 Jan 2019 12:52:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JIeOU+A2BzTtlI2vNUHtNc8twfd9MtN7YomHipsno4g=; b=Oax/+Ix01zPOZ9WxQmf5LgRjuE2HJXR19h8CAaWBzl4bZpOii4hBg3tZ5Q2DLJ3aiV irkl04GtNW4K18XAkmSg/5ltQUF0pLZYAqVnaKmZqMw59oDokAtDupwlqRqpTsABTMkU sxsWUlrBcpkNQQumUNctMuozynjQUq4w3OhOy5uAhfv3ubUBp5eQK9sNgXWKVRy26GV6 iaM6owqmBkHDDTkofAloPgkN26M/wj8yYQlktO/s0wFoHM5dYPP6bmoSbETeE7qPwy6X 12XYB/t9kI87VrTUhvxH4ildyzq2yEhT8C2v+Y5w0uNuhHizw7p67B+8OP/Fhwn58tSL G8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JIeOU+A2BzTtlI2vNUHtNc8twfd9MtN7YomHipsno4g=; b=Qr+6T1BDUFcHIpzl655bf0b1sE83YUD69k+5TMenxHNbGqQFNBRVscaHUwcmXv9go5 wDkZHRSOh+L4u9JBc7qfXIpL8aQ6BG9b2EFTviJRrZkwomwswjZNmmKj3tUb5nEhMK7r 79qTYoXV/lvvK90CBrbBW1+hUYhtpPrpAGs5Z+XrQTuaTTxzUoIY0milMrlVLiiUGOJQ G8b8IwL2i+bnO/ITzC8nut9LI11oQECcxHbfp2ZyQutg6T+Zk1plsHd0RcERAOPjqn0+ cLoEa8uXvBS755Mj87ES9NDtP/jq306crjdFvMr5n7JNz9p31RNJZiD0AhIrpwQOQYp+ VAgA== X-Gm-Message-State: AJcUukemzV5MJluJoEPxKwIVuBIrIhfGQBMjo0foXBuiow/erpXdvbPV C7n+Lc1k6FmVf+r/SFBBtfeaCIOx X-Google-Smtp-Source: ALg8bN4kNF2ANsTlFPptYYQsIPKVrioSig/maEIQtOhlK718l9ZnTG72ll7XPJGxYN7xHQGGHpV3Xg== X-Received: by 2002:adf:9123:: with SMTP id j32mr22731275wrj.122.1547931146470; Sat, 19 Jan 2019 12:52:26 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id o9sm29451158wmh.3.2019.01.19.12.52.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:52:25 -0800 (PST) Subject: [PATCH net-next 2/8] r8169: remove unneeded call in pcierr From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Message-ID: <8ba7776f-73e4-9260-3766-d52faf8a690e@gmail.com> Date: Sat, 19 Jan 2019 21:48:02 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <87f4c590-49ff-c3c8-9b64-4cd146e18ac6@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl8169_hw_reset() is called as part of the reset routine which is scheduled in the line after. So we can remove the call to rtl8169_hw_reset() here. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b2e30e302..fd3c6a548 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6196,8 +6196,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) dev->features &= ~NETIF_F_HIGHDMA; } - rtl8169_hw_reset(tp); - rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); }