tipc: remove zeroing assignments to static global variables

Cleans up TIPC's source code to eliminate the needless initialization
of static variables to zero.

These changes are purely cosmetic and do not alter the operation of TIPC
in any way.

Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 9de32564984a2fb7146b517943bfb60427eebe8f..99a1469e300a5c4f4ebbcfb6f24d6ae7692b3cd2 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -103,9 +103,9 @@ struct bclink {
 };
 
 
-static struct bcbearer *bcbearer = NULL;
-static struct bclink *bclink = NULL;
-static struct link *bcl = NULL;
+static struct bcbearer *bcbearer;
+static struct bclink *bclink;
+static struct link *bcl;
 static DEFINE_SPINLOCK(bc_lock);
 
 /* broadcast-capable node map */
@@ -425,7 +425,7 @@ int tipc_bclink_send_msg(struct sk_buff *buf)
 void tipc_bclink_recv_pkt(struct sk_buff *buf)
 {
 #if (TIPC_BCAST_LOSS_RATE)
-       static int rx_count = 0;
+       static int rx_count;
 #endif
        struct tipc_msg *msg = buf_msg(buf);
        struct tipc_node *node = tipc_node_find(msg_prevnode(msg));

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index e9136f0abe60f93b9f02e694c6ef1c656bdc07a3..68e7290454246609aa7a97d49c26fff4353bb95c 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -42,7 +42,7 @@
 #define MAX_ADDR_STR 32
 
 static struct media media_list[MAX_MEDIA];
-static u32 media_count = 0;
+static u32 media_count;
 
 struct bearer tipc_bearers[MAX_BEARERS];
 

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 5dfe66357794a15d491d303ca00e019b14892bd5..b69092eb95d8af2681e5f1475da5954971396a2b 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -56,7 +56,7 @@ struct eth_bearer {
 };
 
 static struct eth_bearer eth_bearers[MAX_ETH_BEARERS];
-static int eth_started = 0;
+static int eth_started;
 static struct notifier_block notifier;
 
 /**

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 0c70010a7dfe9671ab9f019940354de1de5c1672..274c98e164b7b09b915fc775e6b9314bfba2adae 100644 (file)
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -45,7 +45,7 @@ struct queue_item {
 static struct kmem_cache *tipc_queue_item_cache;
 static struct list_head signal_queue_head;
 static DEFINE_SPINLOCK(qitem_lock);
-static int handler_enabled = 0;
+static int handler_enabled;
 
 static void process_signal_queue(unsigned long dummy);
 

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index a6c989fd4988e198d2217e1ac61a01a15cf93348..483c226c9581a10a598866a1b57e815be79113ab 100644 (file)
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -73,7 +73,7 @@ struct distr_item {
  */
 
 static LIST_HEAD(publ_root);
-static u32 publ_cnt = 0;
+static u32 publ_cnt;
 
 /**
  * publ_to_item - add publication info to a publication message

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 46b2f31f96a1233d77e3fdf73620ea01861e08db..ea3e94e9d93955a8476ee18769b26d3b8198dc2a 100644 (file)
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -104,7 +104,7 @@ struct name_table {
        u32 local_publ_count;
 };
 
-static struct name_table table = { NULL } ;
+static struct name_table table;
 static atomic_t rsv_publ_ok = ATOMIC_INIT(0);
 DEFINE_RWLOCK(tipc_nametbl_lock);
 

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 2ed162f91a082cd84e809385be0181655139c172..3af53e327f497e7d66d50c39fff00a19715a86e8 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -44,7 +44,7 @@ static void node_established_contact(struct tipc_node *n_ptr);
 
 static DEFINE_SPINLOCK(node_create_lock);
 
-u32 tipc_own_tag = 0;
+u32 tipc_own_tag;
 
 /**
  * tipc_node_create - create neighboring node

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 78fcb75bb082247592f3886cb50de0e9518e5677..c23f3380d0a781dd49e855350fa8d4505c386c2f 100644 (file)
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -46,8 +46,8 @@
 
 #define MAX_REJECT_SIZE 1024
 
-static struct sk_buff *msg_queue_head = NULL;
-static struct sk_buff *msg_queue_tail = NULL;
+static struct sk_buff *msg_queue_head;
+static struct sk_buff *msg_queue_tail;
 
 DEFINE_SPINLOCK(tipc_port_list_lock);
 static DEFINE_SPINLOCK(queue_lock);

diff --git a/net/tipc/ref.c b/net/tipc/ref.c
index 3974529a66e75ef17caebed2e789eb3ca47df743..83116892528b448c0097ca3ae432e16995db8810 100644 (file)
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
@@ -89,7 +89,7 @@ struct ref_table {
  * have a reference value of 0 (although this is unlikely).
  */
 
-static struct ref_table tipc_ref_table = { NULL };
+static struct ref_table tipc_ref_table;
 
 static DEFINE_RWLOCK(ref_table_lock);
 

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 0895dec2967c4dcd3658321153d93091586372e2..18aad573f5514433de53fed7bd7fd9d3bc4084e2 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -68,7 +68,7 @@ static const struct proto_ops msg_ops;
 
 static struct proto tipc_proto;
 
-static int sockets_enabled = 0;
+static int sockets_enabled;
 
 static atomic_t tipc_queue_size = ATOMIC_INIT(0);
 

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index acc30e1833c932491a34a8576bed8ddf265d2efd..ca04479c3d423820e66b07c006d2fe0b9e6b3027 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -70,7 +70,7 @@ struct top_srv {
        spinlock_t lock;
 };
 
-static struct top_srv topsrv = { 0 };
+static struct top_srv topsrv;
 
 /**
  * htohl - convert value to endianness used by destination