OSDN Git Service

net: iosm: drop custom netdev(s) removing
authorSergey Ryazanov <ryazanov.s.a@gmail.com>
Mon, 21 Jun 2021 22:50:56 +0000 (01:50 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Jun 2021 17:01:16 +0000 (10:01 -0700)
Since the last commit, the WWAN core will remove all our network
interfaces for us at the time of the WWAN netdev ops unregistering.
Therefore, we can safely drop the custom code that cleans the list of
created netdevs. Anyway it no longer removes any netdev, since all
netdevs were removed earlier in the wwan_unregister_ops() call.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Reviewed-by: M Chetan Kumar <m.chetan.kumar@intel.com>
CC: M Chetan Kumar <m.chetan.kumar@intel.com>
CC: Intel Corporation <linuxwwan@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wwan/iosm/iosm_ipc_wwan.c

index 1711b79..bee9b27 100644 (file)
@@ -329,22 +329,9 @@ struct iosm_wwan *ipc_wwan_init(struct iosm_imem *ipc_imem, struct device *dev)
 
 void ipc_wwan_deinit(struct iosm_wwan *ipc_wwan)
 {
-       int if_id;
-
+       /* This call will remove all child netdev(s) */
        wwan_unregister_ops(ipc_wwan->dev);
 
-       for (if_id = 0; if_id < ARRAY_SIZE(ipc_wwan->sub_netlist); if_id++) {
-               struct iosm_netdev_priv *priv;
-
-               priv = rcu_access_pointer(ipc_wwan->sub_netlist[if_id]);
-               if (!priv)
-                       continue;
-
-               rtnl_lock();
-               ipc_wwan_dellink(ipc_wwan, priv->netdev, NULL);
-               rtnl_unlock();
-       }
-
        mutex_destroy(&ipc_wwan->if_mutex);
 
        kfree(ipc_wwan);