include: remove needless instances of <linux/init.h>

In removing __cpuinit and __devinit support, some files will
no longer need to include <linux/init.h>.  Here we audit the
include files themselves, looking for cases where init.h is
sourced but not actually used.  With these cleaned up, we'll
know that the odds of C files implicitly getting init.h from
random headers in here are somewhat reduced.

Some files were getting other headers via init.h, such as:

In file included from fs/cifs/winucase.c:32:0:
include/linux/nls.h:16:1: error: unknown type name ‘u16’

and so their includes were adjusted to reflect what they
were actually requiring.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

13 files changed, 1 insertions, 13 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 04086c5be930..d7d0230fa9f1 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -45,7 +45,6 @@
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/fs.h>
-#include <linux/init.h>
 #include <linux/file.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
diff --git a/include/linux/fb.h b/include/linux/fb.h
index fe6ac956550e..a23ab6caadfb 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -7,7 +7,6 @@
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)
 
 #include <linux/fs.h>
-#include <linux/init.h>
 #include <linux/workqueue.h>
 #include <linux/notifier.h>
 #include <linux/list.h>
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 93b5ca754b5b..9aa3e3aad564 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -6,7 +6,6 @@
  *  Copyright (C) 1994-2002  Linus Torvalds & authors
  */
 
-#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/ata.h>
 #include <linux/blkdev.h>
diff --git a/include/linux/kdb.h b/include/linux/kdb.h
index 290db1269c4c..8718e1553295 100644
--- a/include/linux/kdb.h
+++ b/include/linux/kdb.h
@@ -22,7 +22,6 @@ typedef enum {
 typedef int (*kdb_func_t)(int, const char **);
 
 #ifdef	CONFIG_KGDB_KDB
-#include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/atomic.h>
 
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 1cc89e9df480..da30bf522401 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/kdev_t.h>
 #include <linux/spinlock.h>
-#include <linux/init.h>
 #include <linux/audit.h>
 #include <linux/in6.h>
 #include <linux/path.h>
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index c3eb102a9cc8..72e584ba3942 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_MODULE_PARAMS_H
 #define _LINUX_MODULE_PARAMS_H
 /* (C) Copyright 2001, 2002 Rusty Russell IBM Corporation */
-#include <linux/init.h>
 #include <linux/stringify.h>
 #include <linux/kernel.h>
 
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 2077489f9887..e4f2878250dc 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -1,7 +1,6 @@
 #ifndef __LINUX_NETFILTER_H
 #define __LINUX_NETFILTER_H
 
-#include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/net.h>
 #include <linux/if.h>
diff --git a/include/linux/nls.h b/include/linux/nls.h
index 5dc635f8d79e..da8c4475e9fa 100644
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -1,7 +1,7 @@
 #ifndef _LINUX_NLS_H
 #define _LINUX_NLS_H
 
-#include <linux/init.h>
+#include <linux/types.h>
 
 /* Unicode has changed over the years.  Unicode code points no longer
  * fit into 16 bits; as of Unicode 5 valid code points range from 0
diff --git a/include/linux/percpu_ida.h b/include/linux/percpu_ida.h
index f5cfdd6a5539..ff63d8a68fc0 100644
--- a/include/linux/percpu_ida.h
+++ b/include/linux/percpu_ida.h
@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 #include <linux/bitops.h>
-#include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/spinlock_types.h>
 #include <linux/wait.h>
diff --git a/include/linux/profile.h b/include/linux/profile.h
index aaad3861beb8..dc049991d25c 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -2,7 +2,6 @@
 #define _LINUX_PROFILE_H
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/cpumask.h>
 #include <linux/cache.h>
 
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index 9974975d40db..1c1b44ebc61e 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/types.h>
-#include <linux/init.h>
 
 struct persistent_ram_buffer;
 struct rs_control;
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index c3a61853cd13..4300742dce35 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -17,7 +17,6 @@
 
 #include <linux/device.h>
 #include <linux/errno.h>
-#include <linux/init.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index 569c07f2e344..094ffa1c8295 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -39,7 +39,6 @@
 #include <linux/mutex.h>
 #include <linux/export.h>
 #include <linux/completion.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/grant_table.h>