rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

[mirror_ubuntu-artful-kernel.git] / net / caif / cfmuxl.c

diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c
index c23979e79dfadce502c5d70927412849b79b868e..b36f24a4c8e74951f07bb06f2dfd6b6c3f81bfa4 100644 (file)
--- a/net/caif/cfmuxl.c
+++ b/net/caif/cfmuxl.c
@@ -108,7 +108,7 @@ struct cflayer *cfmuxl_remove_dnlayer(struct cflayer *layr, u8 phyid)
        int idx = phyid % DN_CACHE_SIZE;
 
        spin_lock_bh(&muxl->transmit_lock);
-       rcu_assign_pointer(muxl->dn_cache[idx], NULL);
+       RCU_INIT_POINTER(muxl->dn_cache[idx], NULL);
        dn = get_from_id(&muxl->frml_list, phyid);
        if (dn == NULL)
                goto out;
@@ -164,7 +164,7 @@ struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 id)
        if (up == NULL)
                goto out;
 
-       rcu_assign_pointer(muxl->up_cache[idx], NULL);
+       RCU_INIT_POINTER(muxl->up_cache[idx], NULL);
        list_del_rcu(&up->node);
 out:
        spin_unlock_bh(&muxl->receive_lock);
@@ -261,7 +261,7 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 
                                idx = layer->id % UP_CACHE_SIZE;
                                spin_lock_bh(&muxl->receive_lock);
-                               rcu_assign_pointer(muxl->up_cache[idx], NULL);
+                               RCU_INIT_POINTER(muxl->up_cache[idx], NULL);
                                list_del_rcu(&layer->node);
                                spin_unlock_bh(&muxl->receive_lock);
                        }