From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD55BC07533 for ; Sun, 8 Sep 2019 12:55:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A887E20693 for ; Sun, 8 Sep 2019 12:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947317; bh=849ghA3tHGvQiAT6aMSTPsQUQKktl4Z5P9iopykH5GU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bLE/P9M9vciRXgypnQLujH6SlYVklB0iHkO5JsSLfIBJ67Hjs/rVQG9l/I9IZOxvk WFeA5Rb64vpUaFw4WJKdBSrowzUiJwIlZ7t7KrrTdDJCXyPX62mdwpIf8Zg035BB0e pTd8yoikko8IKmfz0gPYMxJ0BHBblQqbKIwxA4rE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732567AbfIHMvU (ORCPT ); Sun, 8 Sep 2019 08:51:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:42670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732558AbfIHMvT (ORCPT ); Sun, 8 Sep 2019 08:51:19 -0400 Received: from localhost (unknown [62.28.240.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB5DA20863; Sun, 8 Sep 2019 12:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947079; bh=849ghA3tHGvQiAT6aMSTPsQUQKktl4Z5P9iopykH5GU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0vYPywalov4mLVF4FomsbLOiBxPCTQxH34QPmMYZ17B09wM9eMLS+NxrAE2G+4oXS cWmc3Y3dPMDEdasphUbtKfuPvnJJa/rIk8O3RdqGUtS/0viWjYZMjFW1PnUW/Yypik CqAXN4lL4x8mwx+NuP0OlCcQU1BtU+rjEmsHS5ew= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hayes Wang , "David S. Miller" Subject: [PATCH 5.2 11/94] r8152: remove calling netif_napi_del Date: Sun, 8 Sep 2019 13:41:07 +0100 Message-Id: <20190908121150.756359393@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121150.420989666@linuxfoundation.org> References: <20190908121150.420989666@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hayes Wang [ Upstream commit 973dc6cfc0e2c43ff29ca5645ceaf1ae694ea110 ] Remove unnecessary use of netif_napi_del. This also avoids to call napi_disable() after netif_napi_del(). Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/r8152.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5309,7 +5309,6 @@ static int rtl8152_probe(struct usb_inte return 0; out1: - netif_napi_del(&tp->napi); usb_set_intfdata(intf, NULL); out: free_netdev(netdev); @@ -5327,7 +5326,6 @@ static void rtl8152_disconnect(struct us if (udev->state == USB_STATE_NOTATTACHED) set_bit(RTL8152_UNPLUG, &tp->flags); - netif_napi_del(&tp->napi); unregister_netdev(tp->netdev); cancel_delayed_work_sync(&tp->hw_phy_work); tp->rtl_ops.unload(tp);