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

Commit 1fc54d8f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

[TIPC]: Fix simple sparse warnings 



Tried to run the new tipc stack through sparse.
Following patch fixes all cases where 0 was used
as replacement of NULL.
Use NULL to document this is a pointer and to silence sparse.

This brough sparse warning count down with 127 to 24 warnings.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edb2c34f

net/tipc/bcast.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void bclink_send_nack(struct node *n_ptr) 
		msg_set_bcgap_to(msg, n_ptr->bclink.gap_to);

		msg_set_bcast_tag(msg, tipc_own_tag);



		if (tipc_bearer_send(&bcbearer->bearer, buf, 0)) {

		if (tipc_bearer_send(&bcbearer->bearer, buf, NULL)) {

			bcl->stats.sent_nacks++;

			buf_discard(buf);

		} else {

net/tipc/bearer.c

+10 −10
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ 


#define MAX_ADDR_STR 32



static struct media *media_list = 0;

static struct media *media_list = NULL;

static u32 media_count = 0;



struct bearer *tipc_bearers = 0;

struct bearer *tipc_bearers = NULL;



/**

 * media_name_valid - validate media name
@@ -79,7 +79,7 @@ static struct media *media_find(const char *name) 
		if (!strcmp(m_ptr->name, name))

			return m_ptr;

	}

	return 0;

	return NULL;

}



/**
@@ -287,7 +287,7 @@ static struct bearer *bearer_find(const char *name) 
		if (b_ptr->active && (!strcmp(b_ptr->publ.name, name)))

			return b_ptr;

	}

	return 0;

	return NULL;

}



/**
@@ -307,7 +307,7 @@ struct bearer *tipc_bearer_find_interface(const char *if_name) 
		if (!strcmp(b_if_name, if_name))

			return b_ptr;

	}

	return 0;

	return NULL;

}



/**
@@ -569,7 +569,7 @@ int tipc_enable_bearer(const char *name, u32 bcast_scope, u32 priority) 


int tipc_block_bearer(const char *name)

{

	struct bearer *b_ptr = 0;

	struct bearer *b_ptr = NULL;

	struct link *l_ptr;

	struct link *temp_l_ptr;
@@ -666,8 +666,8 @@ int tipc_bearer_init(void) 
	} else {

		kfree(tipc_bearers);

		kfree(media_list);

		tipc_bearers = 0;

		media_list = 0;

		tipc_bearers = NULL;

		media_list = NULL;

		res = -ENOMEM;

	}

	write_unlock_bh(&tipc_net_lock);
@@ -691,8 +691,8 @@ void tipc_bearer_stop(void) 
	}

	kfree(tipc_bearers);

	kfree(media_list);

	tipc_bearers = 0;

	media_list = 0;

	tipc_bearers = NULL;

	media_list = NULL;

	media_count = 0;

}

net/tipc/cluster.c

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf, 
			 u32 lower, u32 upper);

struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest);



struct node **tipc_local_nodes = 0;

struct node **tipc_local_nodes = NULL;

struct node_map tipc_cltr_bcast_nodes = {0,{0,}};

u32 tipc_highest_allowed_slave = 0;
@@ -61,7 +61,7 @@ struct cluster *tipc_cltr_create(u32 addr) 


	c_ptr = (struct cluster *)kmalloc(sizeof(*c_ptr), GFP_ATOMIC);

	if (c_ptr == NULL)

		return 0;

		return NULL;

	memset(c_ptr, 0, sizeof(*c_ptr));



	c_ptr->addr = tipc_addr(tipc_zone(addr), tipc_cluster(addr), 0);
@@ -73,7 +73,7 @@ struct cluster *tipc_cltr_create(u32 addr) 
	c_ptr->nodes = (struct node **)kmalloc(alloc, GFP_ATOMIC);

	if (c_ptr->nodes == NULL) {

		kfree(c_ptr);

		return 0;

		return NULL;

	}

	memset(c_ptr->nodes, 0, alloc);  

	if (in_own_cluster(addr))
@@ -91,7 +91,7 @@ struct cluster *tipc_cltr_create(u32 addr) 
	}

	else {

		kfree(c_ptr);

		c_ptr = 0;

		c_ptr = NULL;

	}



	return c_ptr;
@@ -204,7 +204,7 @@ struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector) 


	assert(!in_own_cluster(c_ptr->addr));

	if (!c_ptr->highest_node)

		return 0;

		return NULL;



	/* Start entry must be random */

	while (mask > c_ptr->highest_node) {
@@ -222,7 +222,7 @@ struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector) 
		if (tipc_node_has_active_links(c_ptr->nodes[n_num]))

			return c_ptr->nodes[n_num];

	}

	return 0;

	return NULL;

}



/*

net/tipc/cluster.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline struct cluster *tipc_cltr_find(u32 addr) 


	if (z_ptr)

		return z_ptr->clusters[1];

	return 0;

	return NULL;

}



#endif

net/tipc/config.c

+2 −2
Original line number Diff line number Diff line
@@ -683,11 +683,11 @@ int tipc_cfg_init(void) 
	memset(&mng, 0, sizeof(mng));

	INIT_LIST_HEAD(&mng.link_subscribers);



	res = tipc_attach(&mng.user_ref, 0, 0);

	res = tipc_attach(&mng.user_ref, NULL, NULL);

	if (res)

		goto failed;



	res = tipc_createport(mng.user_ref, 0, TIPC_CRITICAL_IMPORTANCE,

	res = tipc_createport(mng.user_ref, NULL, TIPC_CRITICAL_IMPORTANCE,

			      NULL, NULL, NULL,

			      NULL, cfg_named_msg_event, NULL,

			      NULL, &mng.port_ref);