]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8152: remove calling netif_napi_del
authorHayes Wang <hayeswang@realtek.com>
Wed, 28 Aug 2019 01:51:42 +0000 (09:51 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2019 23:02:32 +0000 (16:02 -0700)
Remove unnecessary use of netif_napi_del. This also avoids to call
napi_disable() after netif_napi_del().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index ad3abe26b51b93a0b5df89135b5a3925332a6b3c..04137ac373b07f261c5f276b4cd4d051c80812d9 100644 (file)
@@ -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);