Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2f40a9 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

tipc: fix integer as NULL pointer sparse warnings in tipc 



net/tipc/cluster.c:145:2: warning: Using plain integer as NULL pointer
net/tipc/link.c:3254:36: warning: Using plain integer as NULL pointer
net/tipc/ref.c:151:15: warning: Using plain integer as NULL pointer
net/tipc/zone.c:85:2: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 323dbaba

net/tipc/cluster.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ void tipc_cltr_attach_node(struct cluster *c_ptr, struct node *n_ptr) 
		max_n_num = tipc_highest_allowed_slave;

		max_n_num = tipc_highest_allowed_slave;

	assert(n_num > 0);

	assert(n_num > 0);

	assert(n_num <= max_n_num);

	assert(n_num <= max_n_num);

	assert(c_ptr->nodes[n_num] == 0);

	assert(c_ptr->nodes[n_num] == NULL);

	c_ptr->nodes[n_num] = n_ptr;

	c_ptr->nodes[n_num] = n_ptr;

	if (n_num > c_ptr->highest_node)

	if (n_num > c_ptr->highest_node)

		c_ptr->highest_node = n_num;

		c_ptr->highest_node = n_num;

net/tipc/link.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3251,7 +3251,7 @@ static void link_print(struct link *l_ptr, struct print_buf *buf, 
		if ((mod(msg_seqno(buf_msg(l_ptr->last_out)) -

		if ((mod(msg_seqno(buf_msg(l_ptr->last_out)) -

			 msg_seqno(buf_msg(l_ptr->first_out)))

			 msg_seqno(buf_msg(l_ptr->first_out)))

		     != (l_ptr->out_queue_size - 1))

		     != (l_ptr->out_queue_size - 1))

		    || (l_ptr->last_out->next != 0)) {

		    || (l_ptr->last_out->next != NULL)) {

			tipc_printf(buf, "\nSend queue inconsistency\n");

			tipc_printf(buf, "\nSend queue inconsistency\n");

			tipc_printf(buf, "first_out= %x ", l_ptr->first_out);

			tipc_printf(buf, "first_out= %x ", l_ptr->first_out);

			tipc_printf(buf, "next_out= %x ", l_ptr->next_out);

			tipc_printf(buf, "next_out= %x ", l_ptr->next_out);

net/tipc/ref.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock) 
		reference = (next_plus_upper & ~index_mask) + index;

		reference = (next_plus_upper & ~index_mask) + index;

		entry->data.reference = reference;

		entry->data.reference = reference;

		entry->object = object;

		entry->object = object;

		if (lock != 0)

		if (lock != NULL)

			*lock = &entry->lock;

			*lock = &entry->lock;

		spin_unlock_bh(&entry->lock);

		spin_unlock_bh(&entry->lock);

	}

	}

net/tipc/zone.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ void tipc_zone_attach_cluster(struct _zone *z_ptr, struct cluster *c_ptr) 




	assert(c_ptr->addr);

	assert(c_ptr->addr);

	assert(c_num <= tipc_max_clusters);

	assert(c_num <= tipc_max_clusters);

	assert(z_ptr->clusters[c_num] == 0);

	assert(z_ptr->clusters[c_num] == NULL);

	z_ptr->clusters[c_num] = c_ptr;

	z_ptr->clusters[c_num] = c_ptr;

}

}