Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp821938ybl; Wed, 28 Aug 2019 05:57:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAvooCdfzUwv5D4B2edGMqPTfaxpYbKRPUfPjEPcOMMDqxRWRJquFDUnD2Mgrf2EmjKET0 X-Received: by 2002:a17:90a:1b22:: with SMTP id q31mr4101020pjq.61.1566997066701; Wed, 28 Aug 2019 05:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566997066; cv=none; d=google.com; s=arc-20160816; b=aMUlG3yMUZ91l/k1S/FGehzFY1MqThFZJKL5dkvbvlvoUrh1Yqn+IY1ctcJ46/ukrF 2TPuCLW3NM9469y4dllcPmoYnSfyEnwCqF8oV6QldrEwNXAydQvzUW62nnbP4mIF8d8d /QEjR6C8yfmSnMyxDjXl4knh1CarsPEjAx0hgismhxPd1jmFnfGK9nQxn8KnXnkBRya9 1cUVxdRjCO5QrilzQePEfz021GJJiI4SON591AbaT6bIO8n6gtloI4szVpYVAJR28lHi kV2x+ZYqJB+uyYPnbuq2yu45HZGPFuubIF567NhTT1U04nT40gULgI5u7/OuSVcjuF7P i2cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :authenticated-by; bh=EYuf0B3t79Tu+IGYCKtP3OWwtEopcHpvQX/HHzvMJ0U=; b=HLrXpdgIZYiMig6wQGbDxNEMkme/jayUBQMQamfonAVwS3TblmqzrRkmAUXC5oCIUO ez4JNQdB8bfAiakbLNrZMJAoMcybygmTastMqQR3rsIDnHaO9s3QFUfTkslZyj2v/RAb 3p6jGUkrxfNS2XzsijswYozaUYTBuFPGXPVuudu7BNixvmOdqUUi071uLUqpT+WNNM1P gtUhASUqIycbEkLJ2hsWcqsPOgGdY4xX6R02XOPmWmTCFHuiXINz/lDmxlCGqDXeT1eM DxW9aARGTzEKPuvsZ2h6hf/9DsZfxCsMNvCo9IgNN3ql9hR1SKqce9MQGkGJ7MUOcF3A x5SQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 130si2531036pfb.117.2019.08.28.05.57.31; Wed, 28 Aug 2019 05:57:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726606AbfH1M4j (ORCPT + 99 others); Wed, 28 Aug 2019 08:56:39 -0400 Received: from rtits2.realtek.com ([211.75.126.72]:41713 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726545AbfH1M4h (ORCPT ); Wed, 28 Aug 2019 08:56:37 -0400 Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.62 with qID x7SCuZ0N013841, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (RTITCASV01.realtek.com.tw[172.21.6.18]) by rtits2.realtek.com.tw (8.15.2/2.57/5.78) with ESMTPS id x7SCuZ0N013841 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 28 Aug 2019 20:56:35 +0800 Received: from fc30.localdomain (172.21.177.138) by RTITCASV01.realtek.com.tw (172.21.6.18) with Microsoft SMTP Server id 14.3.468.0; Wed, 28 Aug 2019 20:56:34 +0800 From: Hayes Wang To: CC: , , Hayes Wang Subject: [PATCH net v4 2/2] r8152: remove calling netif_napi_del Date: Wed, 28 Aug 2019 20:56:13 +0800 Message-ID: <1394712342-15778-325-Taiwan-albertk@realtek.com> X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <1394712342-15778-323-Taiwan-albertk@realtek.com> References: <1394712342-15778-314-Taiwan-albertk@realtek.com> <1394712342-15778-323-Taiwan-albertk@realtek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.21.177.138] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unnecessary use of netif_napi_del. This also avoids to call napi_disable() after netif_napi_del(). Fixes: ffa9fec30ca0 ("r8152: set RTL8152_UNPLUG only for real disconnection") Signed-off-by: Hayes Wang --- drivers/net/usb/r8152.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index ad3abe26b51b..04137ac373b0 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5352,7 +5352,6 @@ static int rtl8152_probe(struct usb_interface *intf, return 0; out1: - netif_napi_del(&tp->napi); usb_set_intfdata(intf, NULL); out: free_netdev(netdev); @@ -5367,7 +5366,6 @@ static void rtl8152_disconnect(struct usb_interface *intf) if (tp) { rtl_set_unplug(tp); - netif_napi_del(&tp->napi); unregister_netdev(tp->netdev); cancel_delayed_work_sync(&tp->hw_phy_work); tp->rtl_ops.unload(tp); -- 2.21.0