tipc: remove redundant #includes

Eliminates a number of #include statements that no longer serve any
useful purpose.

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/addr.c b/net/tipc/addr.c
index 483868a75b88662b0a11f8936e844d16d055f54a..88463d9a6f12c99562378a5c8c93b39329b19cf3 100644 (file)
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -35,7 +35,6 @@
  */
 
 #include "core.h"
-#include "node.h"
 #include "addr.h"
 
 /**

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 22a10fadc8c6be7ad55aa75e86dafdc79f352b7e..c0f3b096e7f5098acd013dbbcffcc3472d20ce16 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -38,7 +38,6 @@
 #include "core.h"
 #include "link.h"
 #include "port.h"
-#include "name_distr.h"
 #include "bcast.h"
 
 #define MAX_PKT_DEFAULT_MCAST 1500     /* bcast link max packet size (fixed) */

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 24dc6c2c75ad5a9f27fe82f82ae1921de7742bbf..040f3ed32ec8bf742d67a16e55095474801ebd6e 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -37,7 +37,6 @@
 #include "core.h"
 #include "config.h"
 #include "bearer.h"
-#include "port.h"
 #include "discover.h"
 
 #define MAX_ADDR_STR 32

diff --git a/net/tipc/config.c b/net/tipc/config.c
index a7894ff77ae99051bb3bbc99dddf7065c7bf0072..6c67132f8652d57805ed02154b28da5ef0ac448d 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -36,7 +36,6 @@
 
 #include "core.h"
 #include "port.h"
-#include "link.h"
 #include "name_table.h"
 #include "config.h"
 

diff --git a/net/tipc/core.c b/net/tipc/core.c
index a02bc490caaece4b83eb28a7d0f40efe443bdab1..60b85ec6d106cd0c4907b3237c4ad25b6a5a44c8 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -34,14 +34,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/random.h>
-
 #include "core.h"
 #include "ref.h"
-#include "net.h"
 #include "name_table.h"
 #include "subscr.h"
 #include "config.h"

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index e7223789d15050d1ddb84850fc0e85dbe8c68ecb..be28f5adc7709d9a450dbde716ce8c6538b935c1 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -37,8 +37,6 @@
 #include "core.h"
 #include "link.h"
 #include "discover.h"
-#include "port.h"
-#include "name_table.h"
 
 #define TIPC_LINK_REQ_INIT     125     /* min delay during bearer start up */
 #define TIPC_LINK_REQ_FAST     2000    /* normal delay if bearer has no links */

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index ee683cc8f4b1ff68dda0946c62ba1aed9426605d..101d9cb6a5594a8fcab9cfbcc29e9a0e00c9b19a 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -34,10 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/netdevice.h>
-#include <linux/slab.h>
-#include <net/net_namespace.h>
-
 #include "core.h"
 #include "bearer.h"
 

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index a029cdc2df6d0663bcefa7c8a693d35f6ad819a1..2571ffb4d3500753ae70a2b4f1b3bde88f18b638 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -35,7 +35,6 @@
  */
 
 #include "core.h"
-#include "addr.h"
 #include "msg.h"
 
 u32 tipc_msg_tot_importance(struct tipc_msg *m)

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 0dd648ec080989a7c66d10790899b5187a324aae..376a30b9fd72e0511c07c58e0aff6dfb52aad0c1 100644 (file)
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -35,7 +35,6 @@
  */
 
 #include "core.h"
-#include "addr.h"
 #include "link.h"
 #include "name_distr.h"
 

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 6290becd35be5ddca740c732e3cffdedbebd256f..9bacfd00b91eff6f2ac4dcb1c2fa0dbd479f9258 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -36,10 +36,8 @@
 
 #include "core.h"
 #include "net.h"
-#include "name_table.h"
 #include "name_distr.h"
 #include "subscr.h"
-#include "link.h"
 #include "port.h"
 #include "config.h"
 

diff --git a/net/tipc/node.c b/net/tipc/node.c
index fb54719679a6b0bc4f49b00d5a1ee53cd9e7c641..126d774883dd7e6402e917cc15bc75c117ed544a 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -37,7 +37,6 @@
 #include "core.h"
 #include "config.h"
 #include "node.h"
-#include "port.h"
 #include "name_distr.h"
 
 static void node_lost_contact(struct tipc_node *n_ptr);

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 7a21a5ee43e83f9d1cbb0e23b1d894067934da0e..f972c0b4a7191290619d90ba6068af92aa1ab111 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -34,17 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/net.h>
-#include <linux/socket.h>
-#include <linux/errno.h>
-#include <linux/mm.h>
-#include <linux/poll.h>
-#include <linux/fcntl.h>
-#include <linux/gfp.h>
-#include <asm/string.h>
-#include <asm/atomic.h>
 #include <net/sock.h>
 
 #include <linux/tipc.h>