TL;DR - We removed cpuinit and devinit, which left ~2000 instances of
include <linux/init.h> that were no longer needed. To fully enable
this removal/cleanup, we relocate module_init() from init.h into
module.h. Multi arch/multi config build testing on linux-next has
been used to find and fix any implicit header dependencies prior to
deploying the actual init.h --> module.h move, to preserve bisection.
Additional details beyond TL;DR:
module_init/module_exit and friends moved to module.h
=====================================================
Aside from enabling this init.h cleanup to extend into modular files,
it actually does make sense. For all modules will use some form of
our initfunc processing/categorization, but not all initfunc users
will be necessarily using modular functionality. So we move these
module related macros to module.h and ensure module.h sources init.h
module_init in non modular code:
================================
This series uncovered that we are enabling people to use module_init
in non-modular code. While that works fine, there are at least three
reasons why it probably should not be encouraged:
1) it makes a casual reader of the code assume the code is modular
even though it is obj-y (builtin) or controlled by a bool Kconfig.
2) it makes it too easy to add dead code in a function that is handed
to module_exit() -- [more on that below]
3) it breaks our ability to use priority sorted initcalls properly
[more on that below.]
After this change, a new coder who tries to make use of module_init in
non modular code would find themselves also needing to include the
module.h header. At which point the odds are greater that they would
ask themselves "Am I doing this right? I shouldn't need this."
Note that existing non-modular code that already includes module.h and
uses module_init doesn't get fixed here, since they already build w/o
errors triggered by this change; we'll have to hunt them down later.
module_init and initcall ordering:
==================================
We have a group of about ten priority sorted initcalls, that are
called in init/main.c after most of the hard coded/direct calls
have been processed. These serve the purpose of avoiding everyone
poking at init/main.c to hook in their init sequence. The bins are:
pure_initcall 0
core_initcall 1
postcore_initcall 2
arch_initcall 3
subsys_initcall 4
fs_initcall 5
device_initcall 6
late_initcall 7
These are meant to eventually replace users of the non specific
priority "__initcall" which currently maps onto device_initcall.
This is of interest, because in non-modular code, cpp does this:
module_init --> __initcall --> device_initcall
So all module_init() land in the device_initcall bucket, rather late
in the sequence. That makes sense, since if it was a module, the init
could be real late (days, weeks after boot). But now imagine you add
support for some non-modular bus/arch/infrastructure (say for e.g. PCI)
and you use module_init for it. That means anybody else who wants
to use your subsystem can't do so if they use an initcall of 0 --> 5
priority. For a real world example of this, see patch #1 in this series:
https://lkml.org/lkml/2014/1/14/809
We don't want to force code that is clearly arch or subsys or fs
specific to have to use the device_initcall just because something
else has been mistakenly put (or left) in that bucket. So a couple of
changes do actually change the initcall level where it is inevitably
appropriate to do so. Those are called out explicitly in their
respective commit logs.
module_exit and dead code
=========================
Built in code will never have an opportunity to call functions that
are registered with module_exit(), so any cases of that uncovered in
this series delete that dead code. Note that any built-in code that
was already including module.h and using module_exit won't have shown
up as breakage on the build coverage of this series, so we'll have to
find those independently later. It looks like there may be quite a
few that are invisibly created via module_platform_driver -- a macro
that creates module_init and module_exit automatically. We may want
to consider relocating module_platform_driver into module.h later...
cpuinit
=======
To finalize the removal of cpuinit, which was done several releases
ago, we remove the remaining stub functions from init.h in this
series. We've seen one or two "users" try to creep back in, so this
will close the door on that chapter and prevent creep.
When, what and where?
=====================
When: Ideally, barring any objections or massive oversights on my
part, this will go in at or around rc1, i.e. in about 2wks. In the
meantime I will continue daily re-test on linux-next across ~10 different
arch, using allyesconfig, allmodconfig and arch specific defconfigs
for things like mips/arm/powerpc; as I have been doing for a while.
Where: This work exists as a queue of patches that I apply to
linux-next; since the changes are fixing some things that currently
can only be found there. The patch series can be found at:
http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git
The patches are not in strict chronological order, since when I've
found a header change causes a build regression that is due to an
implicit dependency/inclusion, I place the dependency fix before the
header change that caused it, so that bisection is preserved.
I've avoided annoying Stephen with another queue of patches for
linux-next while the development content was in flux, but now that
the merge window has opened, and new additions are fewer, perhaps he
wouldn't mind tacking it on the end... Stephen?
In order to reduce the size of the overall queue here, I have already
put some dependency-free changes through maintainer trees after
re-testing them on whatever their development baseline was. That made
sense for the larger ones (drivers/[net,usb,input] some arch trees...)
and for the kernel/ mm/ and fs/ ones where the changes were less
trivial and an earlier review was desired. But that independent treatment
doesn't scale for handling all the commits -- hence ~1400 of the
full ~2k of init.h removals remain here in this series.
What: The audit for removal of extra init.h lines has covered
drivers/, all of the main architectures (and some of the more fringe
ones), and core dirs like mm/ fs/ and kernel/ too. The removals from
include/ itself are probably the most valuable, in terms of reducing
the amount of stuff we needlessly feed CPP. There is probably more
fringe ones to be found, but this covers the majority of them.
Additional ones can be fed in later (through the trivial tree perhaps)
as desired.
Build coverage (from memory) has included, but is not limited to:
allyesconfig, allmodconfig:
x86, x86_64, ia64, s390, arm, mips, sparc, powerpc
arch specifc arch/<name>/config/*config files:
arm, mips, powerpc
defconfig:
(all of the above), c6x, parisc, uml, tile, c6x, blackfin, ...
and it will continue to take place for the next ~2wks, until I can
reliably apply the queue to master and submit a pull request.
Thanks for reading this far, and thanks to those who have merged init.h
cleanup commits already! Additional comments, reviews and acks welcomed.
Paul.
---
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Paul Gortmaker (73):
init: delete the __cpuinit related stubs
mm: replace module_init usages with subsys_initcall in nommu.c
fs/notify: don't use module_init for non-modular inotify_user code
netfilter: don't use module_init/exit in core IPV4 code
x86: don't use module_init in non-modular intel_mid_vrtc.c
x86: don't use module_init for non-modular core bootflag code
x86: replace __init_or_module with __init in non-modular vsmp_64.c
drivers/tty/hvc: don't use module_init in non-modular hyp. console code
staging: don't use module_init in non-modular ion_dummy_driver.c
powerpc: use device_initcall for registering rtc devices
powerpc: book3s KVM can be modular so it should use module.h
powerpc: kvm e500/44x is not modular, so don't use module_init
powerpc: use subsys_initcall for Freescale Local Bus
powerpc: don't use module_init for non-modular core hugetlb code
powerpc: don't use module_init in non-modular 83xx suspend code
arm: include module.h in drivers/bus/omap_l3_smx.c
arm: fix implicit module.h use in mach-at91 gpio.h
arm: fix implicit #include <linux/init.h> in entry asm.
arm: mach-s3c64xx mach-crag6410-module.c is not modular
arm: use subsys_initcall in non-modular pl320 IPC code
arm: don't use module_init in non-modular mach-vexpress/spc.c code
alpha: don't use module_init for non-modular core code
sparc: don't use module_init in non-modular pci.c code
m68k: don't use module_init in non-modular mvme16x/rtc.c code
ia64: don't use module_init for non-modular core kernel/mca.c code
ia64: don't use module_init in non-modular sim/simscsi.c code
drivers/clk: don't use module_init in clk-nomadik.c which is non-modular
cpuidle: don't use modular platform register in non-modular ARM drivers
drivers/platform: don't use modular register in non-modular pdev_bus.c
drivers/i2c: busses/i2c-acorn.c is tristate and should use module.h
module: relocate module_init from init.h to module.h
logo: emit "#include <linux/init.h> in autogenerated C file
arm: delete non-required instances of include <linux/init.h>
mips: delete non-required instances of include <linux/init.h>
sparc: delete non-required instances of include <linux/init.h>
s390: delete non-required instances of include <linux/init.h>
alpha: delete non-required instances of <linux/init.h>
blackfin: delete non-required instances of <linux/init.h>
powerpc: delete another unrequired instance of <linux/init.h>
watchdog: delete non-required instances of include <linux/init.h>
video: delete non-required instances of include <linux/init.h>
rtc: delete non-required instances of include <linux/init.h>
scsi: delete non-required instances of include <linux/init.h>
spi: delete non-required instances of include <linux/init.h>
acpi: delete non-required instances of include <linux/init.h>
drivers/power: delete non-required instances of include <linux/init.h>
drivers/media: delete non-required instances of include <linux/init.h>
drivers/ata: delete non-required instances of include <linux/init.h>
drivers/mtd: delete non-required instances of include <linux/init.h>
drivers/hwmon: delete non-required instances of include <linux/init.h>
drivers/i2c: delete non-required instances of include <linux/init.h>
drivers/pinctrl: delete non-required instances of include <linux/init.h>
drivers/isdn: delete non-required instances of include <linux/init.h>
drivers/leds: delete non-required instances of include <linux/init.h>
drivers/pcmcia: delete non-required instances of include <linux/init.h>
drivers/char: delete non-required instances of include <linux/init.h>
drivers/infiniband: delete non-required instances of include <linux/init.h>
drivers/mfd: delete non-required instances of include <linux/init.h>
drivers/gpio: delete non-required instances of include <linux/init.h>
drivers/bluetooth: delete non-required instances of include <linux/init.h>
drivers/mmc: delete non-required instances of include <linux/init.h>
drivers/crypto: delete non-required instances of include <linux/init.h>
drivers/platform: delete non-required instances of include <linux/init.h>
drivers/misc: delete non-required instances of include <linux/init.h>
drivers/edac: delete non-required instances of include <linux/init.h>
drivers/macintosh: delete non-required instances of include <linux/init.h>
drivers/base: delete non-required instances of include <linux/init.h>
drivers/cpufreq: delete non-required instances of <linux/init.h>
drivers/pci: delete non-required instances of <linux/init.h>
drivers/dma: delete non-required instances of <linux/init.h>
drivers/gpu: delete non-required instances of <linux/init.h>
drivers: delete remaining non-required instances of <linux/init.h>
include: remove needless instances of <linux/init.h>
arch/alpha/kernel/err_ev6.c | 1 -
arch/alpha/kernel/irq.c | 1 -
arch/alpha/kernel/srmcons.c | 3 +-
arch/alpha/kernel/traps.c | 1 -
arch/alpha/oprofile/op_model_ev4.c | 1 -
arch/alpha/oprofile/op_model_ev5.c | 1 -
arch/alpha/oprofile/op_model_ev6.c | 1 -
arch/alpha/oprofile/op_model_ev67.c | 1 -
arch/arm/common/dmabounce.c | 1 -
arch/arm/firmware/trusted_foundations.c | 1 -
arch/arm/include/asm/arch_timer.h | 1 -
arch/arm/kernel/entry-armv.S | 2 +
arch/arm/kernel/entry-header.S | 1 -
arch/arm/kernel/hyp-stub.S | 1 -
arch/arm/kernel/suspend.c | 1 -
arch/arm/kernel/unwind.c | 1 -
arch/arm/mach-at91/include/mach/gpio.h | 1 +
arch/arm/mach-cns3xxx/pm.c | 1 -
arch/arm/mach-exynos/headsmp.S | 1 -
arch/arm/mach-footbridge/personal.c | 1 -
arch/arm/mach-imx/headsmp.S | 1 -
arch/arm/mach-imx/iomux-v3.c | 1 -
[.... snip ~1300 lines ...]
drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 -
drivers/watchdog/wdt_pci.c | 1 -
drivers/xen/xen-stub.c | 1 -
fs/notify/inotify/inotify_user.c | 4 +-
include/drm/drmP.h | 2 +-
include/linux/fb.h | 1 -
include/linux/ide.h | 1 -
include/linux/init.h | 77 ----------------------
include/linux/kdb.h | 1 -
include/linux/linux_logo.h | 3 -
include/linux/lsm_audit.h | 1 -
include/linux/module.h | 72 ++++++++++++++++++++
include/linux/moduleparam.h | 1 -
include/linux/netfilter.h | 1 -
include/linux/nls.h | 2 +-
include/linux/percpu_ida.h | 1 -
include/linux/profile.h | 1 -
include/linux/pstore_ram.h | 1 -
include/linux/usb/gadget.h | 1 -
include/linux/zorro.h | 1 -
include/xen/xenbus.h | 1 -
mm/nommu.c | 4 +-
net/ipv4/netfilter.c | 9 +--
scripts/pnmtologo.c | 1 +
scripts/tags.sh | 2 +-
1254 files changed, 131 insertions(+), 1431 deletions(-)
mode change 100755 => 100644 scripts/tags.sh
--
1.8.4.1
Compiling some arm/m68k configs with "# CONFIG_MMU is not set" reveals
two more instances of module_init being used for code that can't
possibly be modular, as CONFIG_MMU is either on or off.
We replace them with subsys_initcall as per what was done in other
mmu-enabled code.
Note that direct use of __initcall is discouraged, vs. one of the
priority categorized subgroups. As __initcall gets mapped onto
device_initcall, our use of subsys_initcall (which makes sense for these
files) will thus change this registration from level 6-device to level
4-subsys (i.e. slightly earlier).
One might think that core_initcall (l2) or postcore_initcall (l3) would
be more appropriate for anything in mm/ but if we look at the actual init
functions themselves, we see they are just sysctl setup stuff, and
hence the choice of subsys_initcall (l4) seems reasonable. At the same
time it minimizes the risk of changing the priority too drastically all
at once. We can adjust further in the future.
Also, a couple instances of missing ";" at EOL are fixed.
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
mm/nommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/nommu.c b/mm/nommu.c
index 8740213..37b04f8 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -2144,7 +2144,7 @@ static int __meminit init_user_reserve(void)
sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17);
return 0;
}
-module_init(init_user_reserve)
+subsys_initcall(init_user_reserve);
/*
* Initialise sysctl_admin_reserve_kbytes.
@@ -2165,4 +2165,4 @@ static int __meminit init_admin_reserve(void)
sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13);
return 0;
}
-module_init(init_admin_reserve)
+subsys_initcall(init_admin_reserve);
--
1.8.4.1
The __cpuinit support was removed several releases ago. People
have had a chance to update their out of tree code, so now we
remove the no-op stubs.
Also delete the mention of __cpuinitdata from the tag script.
Cc: Andrew Morton <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
include/linux/init.h | 11 -----------
scripts/tags.sh | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
mode change 100755 => 100644 scripts/tags.sh
diff --git a/include/linux/init.h b/include/linux/init.h
index e168880..f693cc3 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -91,14 +91,6 @@
#define __exit __section(.exit.text) __exitused __cold notrace
-/* temporary, until all users are removed */
-#define __cpuinit
-#define __cpuinitdata
-#define __cpuinitconst
-#define __cpuexit
-#define __cpuexitdata
-#define __cpuexitconst
-
/* Used for MEMORY_HOTPLUG */
#define __meminit __section(.meminit.text) __cold notrace
#define __meminitdata __section(.meminit.data)
@@ -116,9 +108,6 @@
#define __INITRODATA .section ".init.rodata","a",%progbits
#define __FINITDATA .previous
-/* temporary, until all users are removed */
-#define __CPUINIT
-
#define __MEMINIT .section ".meminit.text", "ax"
#define __MEMINITDATA .section ".meminit.data", "aw"
#define __MEMINITRODATA .section ".meminit.rodata", "a"
diff --git a/scripts/tags.sh b/scripts/tags.sh
old mode 100755
new mode 100644
index 58c4559..78382c2
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -150,7 +150,7 @@ exuberant()
{
all_target_sources | xargs $1 -a \
-I __initdata,__exitdata,__initconst, \
- -I __cpuinitdata,__initdata_memblock \
+ -I __initdata_memblock \
-I __refdata,__attribute,__maybe_unused,__always_unused \
-I __acquires,__releases,__deprecated \
-I __read_mostly,__aligned,____cacheline_aligned \
--
1.8.4.1
The __init_or_module is from commit 05e12e1c4c09cd35ac9f4e6af1e
("x86: fix 27-rc crash on vsmp due to paravirt during module load").
But as of commit 70511134f61bd6e5eed19f767381f9fb3e762d49
("Revert "x86: don't compile vsmp_64 for 32bit") this file
became obj-y and hence is now only for built-in. That makes
any "_or_module" support no longer necessary.
We need to distinguish between the two in order to do some
header reorganization between init.h and module.h and we
don't want to be including module.h in non-modular code.
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/x86/kernel/vsmp_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 992f890..e72ec17 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -69,7 +69,7 @@ static void vsmp_irq_enable(void)
}
PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_enable);
-static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
+static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
unsigned long addr, unsigned len)
{
switch (type) {
--
1.8.4.1
The hugetlbpage.o is obj-y (always built in). It will never
be modular, so using module_init as an alias for __initcall is
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of arch_initcall (which
makes sense for arch code) will thus change this registration
from level 6-device to level 3-arch (i.e. slightly earlier).
However no observable impact of that small difference has
been observed during testing, or is expected.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/mm/hugetlbpage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 90bb6d9..d25c202 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -911,7 +911,7 @@ static int __init hugetlbpage_init(void)
return 0;
}
#endif
-module_init(hugetlbpage_init);
+arch_initcall(hugetlbpage_init);
void flush_dcache_icache_hugepage(struct page *page)
{
--
1.8.4.1
The clk-nomadik.o is built for ARCH_NOMADIK -- which is bool, and
hence this code is either present or absent. It will never be
modular, so using module_init as an alias for __initcall can be
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Mike Turquette <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/clk/clk-nomadik.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index 6a934a5..5be9b9f 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -500,8 +500,7 @@ static int __init nomadik_src_clk_init_debugfs(void)
NULL, NULL, &nomadik_src_clk_debugfs_ops);
return 0;
}
-
-module_init(nomadik_src_clk_init_debugfs);
+device_initcall(nomadik_src_clk_init_debugfs);
#endif
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Len Brown <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/acpi/apei/apei-base.c | 1 -
drivers/acpi/button.c | 1 -
drivers/acpi/fan.c | 1 -
drivers/acpi/hed.c | 1 -
drivers/acpi/pci_irq.c | 1 -
drivers/acpi/power.c | 1 -
drivers/acpi/processor_perflib.c | 1 -
drivers/acpi/processor_thermal.c | 1 -
drivers/acpi/processor_throttling.c | 1 -
drivers/acpi/utils.c | 1 -
10 files changed, 10 deletions(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 8678dfe..a83e10f 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/slab.h>
#include <linux/io.h>
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 11c11f6..3e20dff 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 1fb6290..78b5cc7 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <asm/uaccess.h>
#include <linux/thermal.h>
diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index aafe3ca..215777c 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <acpi/hed.h>
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 52d45ea..7bd6a55 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -30,7 +30,6 @@
#include <linux/dmi.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/pm.h>
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ad7da68..9c909d4 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index ff90054..d2594ad 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/slab.h>
#include <linux/acpi.h>
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index e003663..661c9d2 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/acpi.h>
#include <acpi/processor.h>
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 28baa05..08be363 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/cpufreq.h>
#include <linux/acpi.h>
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 0347a37..492cf4f 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/hardirq.h>
#include <linux/acpi.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Samuel Ortiz <[email protected]>
Cc: Lee Jones <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/mfd/adp5520.c | 1 -
drivers/mfd/cs5535-mfd.c | 1 -
drivers/mfd/janz-cmodio.c | 1 -
drivers/mfd/lpc_ich.c | 1 -
drivers/mfd/lpc_sch.c | 1 -
drivers/mfd/mcp-sa11x0.c | 1 -
drivers/mfd/pcf50633-adc.c | 1 -
drivers/mfd/rc5t583-irq.c | 1 -
drivers/mfd/rdc321x-southbridge.c | 1 -
drivers/mfd/retu-mfd.c | 1 -
drivers/mfd/smsc-ece1099.c | 1 -
drivers/mfd/ti-ssp.c | 1 -
drivers/mfd/ti_am335x_tscadc.c | 1 -
drivers/mfd/tps65912-core.c | 1 -
drivers/mfd/tps65912-irq.c | 1 -
drivers/mfd/twl4030-irq.c | 1 -
drivers/mfd/twl4030-madc.c | 1 -
drivers/mfd/twl6030-irq.c | 1 -
drivers/mfd/vexpress-config.c | 1 -
drivers/mfd/wm8350-core.c | 1 -
drivers/mfd/wm8350-irq.c | 1 -
21 files changed, 21 deletions(-)
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index 6250155..f495b8b 100644
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 17c1301..be91cb5 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -23,7 +23,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/mfd/core.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 81b7d88..433f823 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index be93fa2..010c1b4 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -58,7 +58,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index 3bb05c0..4ee7550 100644
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/lpc_sch.c
@@ -23,7 +23,6 @@
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 41c31b3..29d7698 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -12,7 +12,6 @@
* MCP read/write timeouts from Jordi Colomer, rehacked by rmk.
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/errno.h>
#include <linux/kernel.h>
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index b8941a5..c1984b0 100644
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/completion.h>
diff --git a/drivers/mfd/rc5t583-irq.c b/drivers/mfd/rc5t583-irq.c
index b41db59..bb85020 100644
--- a/drivers/mfd/rc5t583-irq.c
+++ b/drivers/mfd/rc5t583-irq.c
@@ -22,7 +22,6 @@
*/
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/mfd/rc5t583.h>
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index d346146..c795697 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index c8f345f..663f8a3 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -19,7 +19,6 @@
#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/irq.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/module.h>
diff --git a/drivers/mfd/smsc-ece1099.c b/drivers/mfd/smsc-ece1099.c
index 24ae3d8..90112d4 100644
--- a/drivers/mfd/smsc-ece1099.c
+++ b/drivers/mfd/smsc-ece1099.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
diff --git a/drivers/mfd/ti-ssp.c b/drivers/mfd/ti-ssp.c
index a542457..0769ecd 100644
--- a/drivers/mfd/ti-ssp.c
+++ b/drivers/mfd/ti-ssp.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/clk.h>
#include <linux/interrupt.h>
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index d4e8604..6000c49 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/io.h>
diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c
index 27a518e..1f82d60 100644
--- a/drivers/mfd/tps65912-core.c
+++ b/drivers/mfd/tps65912-core.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/gpio.h>
#include <linux/mfd/core.h>
diff --git a/drivers/mfd/tps65912-irq.c b/drivers/mfd/tps65912-irq.c
index d360a83..fbecec7 100644
--- a/drivers/mfd/tps65912-irq.c
+++ b/drivers/mfd/tps65912-irq.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/bug.h>
#include <linux/device.h>
#include <linux/interrupt.h>
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 9aa6d1e..596b1f6 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -27,7 +27,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 4c583e4..d700cd2 100644
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -29,7 +29,6 @@
*
*/
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 18a607e..a6bb17d 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -31,7 +31,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
index 84ce6b9..0c9c350 100644
--- a/drivers/mfd/vexpress-config.c
+++ b/drivers/mfd/vexpress-config.c
@@ -16,7 +16,6 @@
#include <linux/bitops.h>
#include <linux/completion.h>
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index 7c1ae24..4ab527f 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/bug.h>
#include <linux/device.h>
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index 624ff90..cd01f79 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/bug.h>
#include <linux/device.h>
#include <linux/interrupt.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/macintosh/adb-iop.c | 1 -
drivers/macintosh/ams/ams-input.c | 1 -
drivers/macintosh/macio-adb.c | 1 -
drivers/macintosh/via-macii.c | 1 -
drivers/macintosh/via-pmu68k.c | 1 -
drivers/macintosh/windfarm_ad7417_sensor.c | 1 -
drivers/macintosh/windfarm_fcu_controls.c | 1 -
drivers/macintosh/windfarm_lm75_sensor.c | 1 -
drivers/macintosh/windfarm_max6690_sensor.c | 1 -
drivers/macintosh/windfarm_smu_sat.c | 1 -
10 files changed, 10 deletions(-)
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index f5f4da3..2c242f7 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/proc_fs.h>
#include <asm/macintosh.h>
diff --git a/drivers/macintosh/ams/ams-input.c b/drivers/macintosh/ams/ams-input.c
index 2edae7d..b1bdd48 100644
--- a/drivers/macintosh/ams/ams-input.c
+++ b/drivers/macintosh/ams/ams-input.c
@@ -14,7 +14,6 @@
#include <linux/types.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include "ams.h"
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 87de8d9..c8fcac0 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -14,7 +14,6 @@
#include <asm/pgtable.h>
#include <asm/hydra.h>
#include <asm/irq.h>
-#include <linux/init.h>
#include <linux/ioport.h>
struct preg {
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 3725f08..fd27da3 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -30,7 +30,6 @@
#include <linux/delay.h>
#include <linux/adb.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <asm/macintosh.h>
#include <asm/macints.h>
#include <asm/mac_via.h>
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index a00ee41..d2e252e 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -25,7 +25,6 @@
#include <linux/miscdevice.h>
#include <linux/blkdev.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/adb.h>
diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c
index 7c28b71..76715a7 100644
--- a/drivers/macintosh/windfarm_ad7417_sensor.c
+++ b/drivers/macintosh/windfarm_ad7417_sensor.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/i2c.h>
#include <asm/prom.h>
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index 0226b79..50ba619 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/i2c.h>
#include <asm/prom.h>
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 590214b..704dd2e 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/i2c.h>
#include <asm/prom.h>
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index 87e439b..a3504d3 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -8,7 +8,6 @@
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <asm/prom.h>
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index ad6223e..b6d70d2 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -10,7 +10,6 @@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/i2c.h>
#include <linux/mutex.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Marcel Holtmann <[email protected]>
Cc: Gustavo Padovan <[email protected]>
Cc: Johan Hedberg <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/bluetooth/ath3k.c | 1 -
drivers/bluetooth/bcm203x.c | 1 -
drivers/bluetooth/bfusb.c | 1 -
drivers/bluetooth/bluecard_cs.c | 1 -
drivers/bluetooth/bpa10x.c | 1 -
drivers/bluetooth/bt3c_cs.c | 1 -
drivers/bluetooth/btuart_cs.c | 1 -
drivers/bluetooth/dtl1_cs.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 41ec6f9..427f280 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/errno.h>
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 364f82b..40db9a9 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -26,7 +26,6 @@
#include <linux/atomic.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/errno.h>
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 3138699..48b71f0 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/errno.h>
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 57427de..0aae563 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/sched.h>
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 8a31991..40281c0 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/sched.h>
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 73d8799..f3508fe 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/delay.h>
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index a03ecc2..057104e 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/delay.h>
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 52eed1f..5bb80e4 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/delay.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Jean Delvare <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/hwmon/adcxx.c | 1 -
drivers/hwmon/adm1021.c | 1 -
drivers/hwmon/adm1025.c | 1 -
drivers/hwmon/adm1026.c | 1 -
drivers/hwmon/adm1029.c | 1 -
drivers/hwmon/adm1031.c | 1 -
drivers/hwmon/adm9240.c | 1 -
drivers/hwmon/ads1015.c | 1 -
drivers/hwmon/ads7828.c | 1 -
drivers/hwmon/ads7871.c | 1 -
drivers/hwmon/adt7310.c | 1 -
drivers/hwmon/adt7410.c | 1 -
drivers/hwmon/adt7411.c | 1 -
drivers/hwmon/adt7475.c | 1 -
drivers/hwmon/adt7x10.c | 1 -
drivers/hwmon/amc6821.c | 1 -
drivers/hwmon/asb100.c | 1 -
drivers/hwmon/atxp1.c | 1 -
drivers/hwmon/da9052-hwmon.c | 1 -
drivers/hwmon/da9055-hwmon.c | 1 -
drivers/hwmon/ds1621.c | 1 -
drivers/hwmon/ds620.c | 1 -
drivers/hwmon/emc1403.c | 1 -
drivers/hwmon/emc2103.c | 1 -
drivers/hwmon/emc6w201.c | 1 -
drivers/hwmon/fam15h_power.c | 1 -
drivers/hwmon/fschmd.c | 1 -
drivers/hwmon/g760a.c | 1 -
drivers/hwmon/g762.c | 1 -
drivers/hwmon/gl518sm.c | 1 -
drivers/hwmon/gl520sm.c | 1 -
drivers/hwmon/gpio-fan.c | 1 -
drivers/hwmon/hih6130.c | 1 -
drivers/hwmon/ina209.c | 1 -
drivers/hwmon/ina2xx.c | 1 -
drivers/hwmon/jc42.c | 1 -
drivers/hwmon/k10temp.c | 1 -
drivers/hwmon/k8temp.c | 1 -
drivers/hwmon/lineage-pem.c | 1 -
drivers/hwmon/lm63.c | 1 -
drivers/hwmon/lm70.c | 1 -
drivers/hwmon/lm73.c | 1 -
drivers/hwmon/lm75.c | 1 -
drivers/hwmon/lm77.c | 1 -
drivers/hwmon/lm80.c | 1 -
drivers/hwmon/lm83.c | 1 -
drivers/hwmon/lm85.c | 1 -
drivers/hwmon/lm87.c | 1 -
drivers/hwmon/lm90.c | 1 -
drivers/hwmon/lm92.c | 1 -
drivers/hwmon/lm93.c | 1 -
drivers/hwmon/lm95234.c | 1 -
drivers/hwmon/lm95241.c | 1 -
drivers/hwmon/lm95245.c | 1 -
drivers/hwmon/ltc4151.c | 1 -
drivers/hwmon/ltc4215.c | 1 -
drivers/hwmon/ltc4245.c | 1 -
drivers/hwmon/ltc4261.c | 1 -
drivers/hwmon/max1111.c | 1 -
drivers/hwmon/max16065.c | 1 -
drivers/hwmon/max1619.c | 1 -
drivers/hwmon/max1668.c | 1 -
drivers/hwmon/max197.c | 1 -
drivers/hwmon/max6639.c | 1 -
drivers/hwmon/max6642.c | 1 -
drivers/hwmon/max6650.c | 1 -
drivers/hwmon/max6697.c | 1 -
drivers/hwmon/pmbus/adm1275.c | 1 -
drivers/hwmon/pmbus/lm25066.c | 1 -
drivers/hwmon/pmbus/ltc2978.c | 1 -
drivers/hwmon/pmbus/max16064.c | 1 -
drivers/hwmon/pmbus/max34440.c | 1 -
drivers/hwmon/pmbus/max8688.c | 1 -
drivers/hwmon/pmbus/pmbus.c | 1 -
drivers/hwmon/pmbus/pmbus_core.c | 1 -
drivers/hwmon/pmbus/ucd9000.c | 1 -
drivers/hwmon/pmbus/ucd9200.c | 1 -
drivers/hwmon/pmbus/zl6100.c | 1 -
drivers/hwmon/s3c-hwmon.c | 1 -
drivers/hwmon/sch5627.c | 1 -
drivers/hwmon/sch5636.c | 1 -
drivers/hwmon/sht15.c | 1 -
drivers/hwmon/sht21.c | 1 -
drivers/hwmon/smm665.c | 1 -
drivers/hwmon/smsc47m192.c | 1 -
drivers/hwmon/thmc50.c | 1 -
drivers/hwmon/tmp102.c | 1 -
drivers/hwmon/tmp401.c | 1 -
drivers/hwmon/tmp421.c | 1 -
drivers/hwmon/twl4030-madc-hwmon.c | 1 -
drivers/hwmon/w83791d.c | 1 -
drivers/hwmon/w83792d.c | 1 -
drivers/hwmon/w83793.c | 1 -
drivers/hwmon/w83795.c | 1 -
drivers/hwmon/w83l785ts.c | 1 -
drivers/hwmon/w83l786ng.c | 1 -
96 files changed, 96 deletions(-)
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c
index 04c08c2..757103d 100644
--- a/drivers/hwmon/adcxx.c
+++ b/drivers/hwmon/adcxx.c
@@ -34,7 +34,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 29dd9f7..48bcbe1 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 7e16e5d..a3857da 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -46,7 +46,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index b3498ac..f3fa888 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c
index 9ee5e06..f7fc55d 100644
--- a/drivers/hwmon/adm1029.c
+++ b/drivers/hwmon/adm1029.c
@@ -26,7 +26,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 253ea39..c8f4ac3 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 086d02a..4abdbf9 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -41,7 +41,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index 7f9dc2f..b40044d 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index 7092c78..166c024 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -29,7 +29,6 @@
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c
index 3eff73b..d440431 100644
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
@@ -61,7 +61,6 @@
#define OSC_RBG_BM (1 << 0)
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spi/spi.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c
index 5994cf6..b7080bc 100644
--- a/drivers/hwmon/adt7310.c
+++ b/drivers/hwmon/adt7310.c
@@ -8,7 +8,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spi/spi.h>
#include <asm/unaligned.h>
diff --git a/drivers/hwmon/adt7410.c b/drivers/hwmon/adt7410.c
index 0dc066a..9e93743 100644
--- a/drivers/hwmon/adt7410.c
+++ b/drivers/hwmon/adt7410.c
@@ -8,7 +8,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include "adt7x10.h"
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c
index d9299de..81b4ee0 100644
--- a/drivers/hwmon/adt7411.c
+++ b/drivers/hwmon/adt7411.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/jiffies.h>
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 22d008b..c175631 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -13,7 +13,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/adt7x10.c b/drivers/hwmon/adt7x10.c
index 98141f4..039ee65 100644
--- a/drivers/hwmon/adt7x10.c
+++ b/drivers/hwmon/adt7x10.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c
index eea8172..d8be85d 100644
--- a/drivers/hwmon/amc6821.c
+++ b/drivers/hwmon/amc6821.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h> /* Needed for KERN_INFO */
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index f960636..219e1f8 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -45,7 +45,6 @@
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/mutex.h>
#include "lm75.h"
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index ddff02e..d350d7e 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -19,7 +19,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c
index afd3104..bcce638 100644
--- a/drivers/hwmon/da9052-hwmon.c
+++ b/drivers/hwmon/da9052-hwmon.c
@@ -15,7 +15,6 @@
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/hwmon/da9055-hwmon.c b/drivers/hwmon/da9055-hwmon.c
index 029ecab..38269c8 100644
--- a/drivers/hwmon/da9055-hwmon.c
+++ b/drivers/hwmon/da9055-hwmon.c
@@ -16,7 +16,6 @@
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 872d767..8440ece 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -35,7 +35,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c
index 0918b91..a32d062 100644
--- a/drivers/hwmon/ds620.c
+++ b/drivers/hwmon/ds620.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index 90ec117..89b13b6 100644
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c
index 2c137b2..a1ed77e 100644
--- a/drivers/hwmon/emc2103.c
+++ b/drivers/hwmon/emc2103.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c
index 82e661e..9735909 100644
--- a/drivers/hwmon/emc6w201.c
+++ b/drivers/hwmon/emc6w201.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 6040121..ea59b8d 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -21,7 +21,6 @@
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/bitops.h>
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index d58abdc..b445f13 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -33,7 +33,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c
index ea6480b..641738d 100644
--- a/drivers/hwmon/g760a.c
+++ b/drivers/hwmon/g760a.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/g762.c b/drivers/hwmon/g762.c
index b4b8b5b..b5ddfce 100644
--- a/drivers/hwmon/g762.c
+++ b/drivers/hwmon/g762.c
@@ -42,7 +42,6 @@
#include <linux/device.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 95257a5..ab9d967 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -33,7 +33,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index ed56e09..e45adec 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 73181be..2f3199e 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/hwmon/hih6130.c b/drivers/hwmon/hih6130.c
index 7d68a08..679e3b1 100644
--- a/drivers/hwmon/hih6130.c
+++ b/drivers/hwmon/hih6130.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/ina209.c b/drivers/hwmon/ina209.c
index 5378fde..9559443 100644
--- a/drivers/hwmon/ina209.c
+++ b/drivers/hwmon/ina209.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/bug.h>
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index 93d26e8..cb7629e 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 6013611..e679a1e 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index baf375b..3123529 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -20,7 +20,6 @@
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <asm/processor.h>
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 734d55d..976358c 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/pci.h>
diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c
index ebbb9f4..49b2fa9 100644
--- a/drivers/hwmon/lineage-pem.c
+++ b/drivers/hwmon/lineage-pem.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index d0def50..a7e1fa8 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -38,7 +38,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
index 505a59e..61fe3fc 100644
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -26,7 +26,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 9653bb8..b71fc5a 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 84a55ea..56a2d54 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -19,7 +19,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index f17beb5..6a4b1a0 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -26,7 +26,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index eba89aa..3398f9e 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index e998034..58d7284 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -32,7 +32,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 3894c40..178e9a1 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -25,7 +25,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 333092c..87319d7 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -57,7 +57,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 8b8f3aa..bc41682 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -85,7 +85,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 71626f3..c0de4b4 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -41,7 +41,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index a6f4605..6c16d4e 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -39,7 +39,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/lm95234.c b/drivers/hwmon/lm95234.c
index 411202b..c1dba98 100644
--- a/drivers/hwmon/lm95234.c
+++ b/drivers/hwmon/lm95234.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c
index 4b68fb2..beb5d71 100644
--- a/drivers/hwmon/lm95241.c
+++ b/drivers/hwmon/lm95241.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/lm95245.c b/drivers/hwmon/lm95245.c
index a6c85f0..e16291d 100644
--- a/drivers/hwmon/lm95245.c
+++ b/drivers/hwmon/lm95245.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c
index af81be1..b1e4d16 100644
--- a/drivers/hwmon/ltc4151.c
+++ b/drivers/hwmon/ltc4151.c
@@ -30,7 +30,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
index 8a14296..1217165 100644
--- a/drivers/hwmon/ltc4215.c
+++ b/drivers/hwmon/ltc4215.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
index d4172933..e5b24dc 100644
--- a/drivers/hwmon/ltc4245.c
+++ b/drivers/hwmon/ltc4245.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c
index 0becd69..4be7e65 100644
--- a/drivers/hwmon/ltc4261.c
+++ b/drivers/hwmon/ltc4261.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c
index eda077d..e45a35f 100644
--- a/drivers/hwmon/max1111.c
+++ b/drivers/hwmon/max1111.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index d4efc79..cf1fa11 100644
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 445e5d4..a2bef68 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -27,7 +27,6 @@
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max1668.c b/drivers/hwmon/max1668.c
index a762635..11a2b21 100644
--- a/drivers/hwmon/max1668.c
+++ b/drivers/hwmon/max1668.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max197.c b/drivers/hwmon/max197.c
index 96dccaf..49c6d31 100644
--- a/drivers/hwmon/max197.c
+++ b/drivers/hwmon/max197.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/mutex.h>
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index 066e587..7be11bb 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max6642.c b/drivers/hwmon/max6642.c
index 8326fbd..a8d0a7c 100644
--- a/drivers/hwmon/max6642.c
+++ b/drivers/hwmon/max6642.c
@@ -33,7 +33,6 @@
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
index 0cafc39..a56bae8 100644
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
@@ -32,7 +32,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/max6697.c b/drivers/hwmon/max6697.c
index 7fd3eaf..8b60817 100644
--- a/drivers/hwmon/max6697.c
+++ b/drivers/hwmon/max6697.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index 60aad95..4594060 100644
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index a26b1d1..dcacb62 100644
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/ltc2978.c b/drivers/hwmon/pmbus/ltc2978.c
index de3c152..a7dec29 100644
--- a/drivers/hwmon/pmbus/ltc2978.c
+++ b/drivers/hwmon/pmbus/ltc2978.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/max16064.c b/drivers/hwmon/pmbus/max16064.c
index fa237a3..ff1d90d 100644
--- a/drivers/hwmon/pmbus/max16064.c
+++ b/drivers/hwmon/pmbus/max16064.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index 7e930c3..070a3af 100644
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/max8688.c b/drivers/hwmon/pmbus/max8688.c
index f04454a..fb704d7 100644
--- a/drivers/hwmon/pmbus/max8688.c
+++ b/drivers/hwmon/pmbus/max8688.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include "pmbus.h"
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 7e91700..7369c2d 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/mutex.h>
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 3cbf66e..6f89a41 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index fbb1479..48e1c0d 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c
index 033d6ac..67ff25a 100644
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c
index 8196441..318022f 100644
--- a/drivers/hwmon/pmbus/zl6100.c
+++ b/drivers/hwmon/pmbus/zl6100.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
index 73bd64e..7aab78a 100644
--- a/drivers/hwmon/s3c-hwmon.c
+++ b/drivers/hwmon/s3c-hwmon.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/io.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/interrupt.h>
diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 0cc99fd..aa8afbd 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -20,7 +20,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/platform_device.h>
diff --git a/drivers/hwmon/sch5636.c b/drivers/hwmon/sch5636.c
index 547b5c9..8a82c64 100644
--- a/drivers/hwmon/sch5636.c
+++ b/drivers/hwmon/sch5636.c
@@ -20,7 +20,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/platform_device.h>
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 97cd45a..b9503a0 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -20,7 +20,6 @@
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/mutex.h>
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c
index 2e9f957..9c5635e 100644
--- a/drivers/hwmon/sht21.c
+++ b/drivers/hwmon/sht21.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/smm665.c b/drivers/hwmon/smm665.c
index d9e1b7d..aa2c677 100644
--- a/drivers/hwmon/smm665.c
+++ b/drivers/hwmon/smm665.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index efee4c5..c663ecb 100644
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
index db288db..9d716aa 100644
--- a/drivers/hwmon/thmc50.c
+++ b/drivers/hwmon/thmc50.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 6748b45..b5a048d 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index 7fa6e7d..a472ac2 100644
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -32,7 +32,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index ae26b06..1107cfd 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -25,7 +25,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c
index 6c6d440..6a58de3 100644
--- a/drivers/hwmon/twl4030-madc-hwmon.c
+++ b/drivers/hwmon/twl4030-madc-hwmon.c
@@ -23,7 +23,6 @@
* 02110-1301 USA
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/i2c/twl.h>
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index bdcf2dc..f42f50e 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -33,7 +33,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index df58580..f25d93e 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -36,7 +36,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 9d63d71..9ee58bf 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -31,7 +31,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index 908209d..875fd94 100644
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 39dbe99..d295524 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -32,7 +32,6 @@
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c
index 6ed76ce..339e1c4 100644
--- a/drivers/hwmon/w83l786ng.c
+++ b/drivers/hwmon/w83l786ng.c
@@ -25,7 +25,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Alessandro Zummo <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/rtc/rtc-ab8500.c | 1 -
drivers/rtc/rtc-au1xxx.c | 1 -
drivers/rtc/rtc-bfin.c | 1 -
drivers/rtc/rtc-bq32k.c | 1 -
drivers/rtc/rtc-bq4802.c | 1 -
drivers/rtc/rtc-dm355evm.c | 1 -
drivers/rtc/rtc-ds1305.c | 1 -
drivers/rtc/rtc-ds1307.c | 1 -
drivers/rtc/rtc-ds1390.c | 1 -
drivers/rtc/rtc-ds1511.c | 1 -
drivers/rtc/rtc-ds1553.c | 1 -
drivers/rtc/rtc-ds2404.c | 1 -
drivers/rtc/rtc-ds3234.c | 1 -
drivers/rtc/rtc-lpc32xx.c | 1 -
drivers/rtc/rtc-ls1x.c | 1 -
drivers/rtc/rtc-m41t80.c | 1 -
drivers/rtc/rtc-m48t59.c | 1 -
drivers/rtc/rtc-max6902.c | 1 -
drivers/rtc/rtc-mpc5121.c | 1 -
drivers/rtc/rtc-mrst.c | 1 -
drivers/rtc/rtc-palmas.c | 1 -
drivers/rtc/rtc-pcf2123.c | 1 -
drivers/rtc/rtc-pcf50633.c | 1 -
drivers/rtc/rtc-pcf8583.c | 1 -
drivers/rtc/rtc-pl030.c | 1 -
drivers/rtc/rtc-pl031.c | 1 -
drivers/rtc/rtc-pm8xxx.c | 1 -
drivers/rtc/rtc-puv3.c | 1 -
drivers/rtc/rtc-r9701.c | 1 -
drivers/rtc/rtc-rc5t583.c | 1 -
drivers/rtc/rtc-rs5c348.c | 1 -
drivers/rtc/rtc-rx4581.c | 1 -
drivers/rtc/rtc-rx8025.c | 1 -
drivers/rtc/rtc-s3c.c | 1 -
drivers/rtc/rtc-sa1100.c | 1 -
drivers/rtc/rtc-snvs.c | 1 -
drivers/rtc/rtc-spear.c | 1 -
drivers/rtc/rtc-stk17ta8.c | 1 -
drivers/rtc/rtc-stmp3xxx.c | 1 -
drivers/rtc/rtc-tps6586x.c | 1 -
drivers/rtc/rtc-tps65910.c | 1 -
drivers/rtc/rtc-tps80031.c | 1 -
drivers/rtc/rtc-twl.c | 1 -
drivers/rtc/rtc-v3020.c | 1 -
drivers/rtc/rtc-vr41xx.c | 1 -
drivers/rtc/rtc-vt8500.c | 1 -
46 files changed, 46 deletions(-)
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c
index 727e2f5..480525c 100644
--- a/drivers/rtc/rtc-ab8500.c
+++ b/drivers/rtc/rtc-ab8500.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/rtc.h>
#include <linux/mfd/abx500.h>
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
index ed526a1..4307a8f 100644
--- a/drivers/rtc/rtc-au1xxx.c
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <asm/mach-au1x00/au1000.h>
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index 0c53f45..a7669c1 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -44,7 +44,6 @@
#include <linux/bcd.h>
#include <linux/completion.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index c74bf0d..5e2a74a 100644
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c
index fc0ff87..23d0469 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -5,7 +5,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
index 1aca083..e6b6bdc 100644
--- a/drivers/rtc/rtc-dm355evm.c
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -9,7 +9,6 @@
* 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 2dd586a..d913952 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -9,7 +9,6 @@
*
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/bcd.h>
#include <linux/slab.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 4e75345..72d2bf9 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/string.h>
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index be9d8c0..3d5f128 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -13,7 +13,6 @@
* (alarms, trickle charger, different control registers) are unavailable.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index bc7b4fc..a894336 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -15,7 +15,6 @@
*/
#include <linux/bcd.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/gfp.h>
#include <linux/delay.h>
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index fd31571..89e3008 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -9,7 +9,6 @@
*/
#include <linux/bcd.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/gfp.h>
#include <linux/delay.h>
diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c
index fc209dc..8574301 100644
--- a/drivers/rtc/rtc-ds2404.c
+++ b/drivers/rtc/rtc-ds2404.c
@@ -9,7 +9,6 @@
#include <linux/platform_device.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/types.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index 4c9ba53..258fe11 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -11,7 +11,6 @@
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
index bfdbcb8..23b7727 100644
--- a/drivers/rtc/rtc-lpc32xx.c
+++ b/drivers/rtc/rtc-lpc32xx.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c
index 682ecb0..fefeba8 100644
--- a/drivers/rtc/rtc-ls1x.c
+++ b/drivers/rtc/rtc-ls1x.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/types.h>
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index a5248aa..953bc79 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -15,7 +15,6 @@
#include <linux/bcd.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 11880c1..9fac68b 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index ac3f419..4671366 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/spi/spi.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index dc4f142..0d0cb89 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/rtc.h>
#include <linux/of.h>
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index e2436d1..4925003 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -33,7 +33,6 @@
#include <linux/spinlock.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/sfi.h>
#include <asm-generic/rtc.h>
diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index fffb7d3..8eee0a5 100644
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -25,7 +25,6 @@
#include <linux/bcd.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mfd/palmas.h>
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index d1953bb..27869a6 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -36,7 +36,6 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index e6b6911..adb5622 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index c263984..ead381e 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -16,7 +16,6 @@
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index f85a1a9..746f8c7 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -9,7 +9,6 @@
*/
#include <linux/module.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/amba/bus.h>
#include <linux/io.h>
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 99181fff..0638941 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -17,7 +17,6 @@
*/
#include <linux/module.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/amba/bus.h>
#include <linux/io.h>
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c
index 03f8f75..1db02aa 100644
--- a/drivers/rtc/rtc-pm8xxx.c
+++ b/drivers/rtc/rtc-pm8xxx.c
@@ -11,7 +11,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/pm.h>
#include <linux/slab.h>
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 1ecfe3b..bac83ee 100644
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/string.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index feeedbd..11bcd60 100644
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/spi/spi.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-rc5t583.c b/drivers/rtc/rtc-rc5t583.c
index e53e9b1..9539efb 100644
--- a/drivers/rtc/rtc-rc5t583.c
+++ b/drivers/rtc/rtc-rc5t583.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index 090a101..e561910 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -16,7 +16,6 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/rtc/rtc-rx4581.c b/drivers/rtc/rtc-rx4581.c
index 6889222..d2e42df 100644
--- a/drivers/rtc/rtc-rx4581.c
+++ b/drivers/rtc/rtc-rx4581.c
@@ -34,7 +34,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/spi/spi.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index 8fa23ea..fcdd253 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/bcd.h>
#include <linux/i2c.h>
#include <linux/list.h>
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 7afd373..372554c 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/string.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 0f7adeb..c0bcc67 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -25,7 +25,6 @@
#include <linux/module.h>
#include <linux/clk.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c
index fa384fe..8ee9483 100644
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@ -9,7 +9,6 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index c492cf0..de2c9a5 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -12,7 +12,6 @@
#include <linux/bcd.h>
#include <linux/clk.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/module.h>
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index a176ba6..5b55532 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -12,7 +12,6 @@
*/
#include <linux/bcd.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/gfp.h>
#include <linux/delay.h>
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index ea96492..337ee6c 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c
index 426901c..6656ae1 100644
--- a/drivers/rtc/rtc-tps6586x.c
+++ b/drivers/rtc/rtc-tps6586x.c
@@ -22,7 +22,6 @@
#include <linux/device.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mfd/tps6586x.h>
#include <linux/module.h>
diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
index 7af0020..bc5beb5 100644
--- a/drivers/rtc/rtc-tps65910.c
+++ b/drivers/rtc/rtc-tps65910.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-tps80031.c b/drivers/rtc/rtc-tps80031.c
index 3e400dc..202d391 100644
--- a/drivers/rtc/rtc-tps80031.c
+++ b/drivers/rtc/rtc-tps80031.c
@@ -26,7 +26,6 @@
#include <linux/bcd.h>
#include <linux/device.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mfd/tps80031.h>
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index 1915464..48920f1 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 25222cd..7fd489c 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -21,7 +21,6 @@
*/
#include <linux/platform_device.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/rtc.h>
#include <linux/types.h>
#include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 88c9c92..37f2fb8 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -19,7 +19,6 @@
*/
#include <linux/err.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c
index df2ef3e..22dd231 100644
--- a/drivers/rtc/rtc-vt8500.c
+++ b/drivers/rtc/rtc-vt8500.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/rtc.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/bcd.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Doug Thompson <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: David Daney <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/edac/amd64_edac.h | 1 -
drivers/edac/edac_device.c | 1 -
drivers/edac/edac_mc.c | 1 -
drivers/edac/edac_pci.c | 1 -
drivers/edac/octeon_edac-l2c.c | 1 -
drivers/edac/octeon_edac-lmc.c | 1 -
drivers/edac/octeon_edac-pc.c | 1 -
drivers/edac/octeon_edac-pci.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 6dc1fcc..75d2d12 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -64,7 +64,6 @@
#include <linux/module.h>
#include <linux/ctype.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/slab.h>
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 592af5f..8c3f104 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/smp.h>
-#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/highmem.h>
#include <linux/timer.h>
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index e8c9ef0..b20ecb7 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/smp.h>
-#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/highmem.h>
#include <linux/timer.h>
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index 2cf44b4d..90dd64f 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/smp.h>
-#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/highmem.h>
#include <linux/timer.h>
diff --git a/drivers/edac/octeon_edac-l2c.c b/drivers/edac/octeon_edac-l2c.c
index 7e98084..c049af4 100644
--- a/drivers/edac/octeon_edac-l2c.c
+++ b/drivers/edac/octeon_edac-l2c.c
@@ -9,7 +9,6 @@
* written by Ralf Baechle <[email protected]>
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/edac.h>
diff --git a/drivers/edac/octeon_edac-lmc.c b/drivers/edac/octeon_edac-lmc.c
index 93412d6..3c0d68c 100644
--- a/drivers/edac/octeon_edac-lmc.c
+++ b/drivers/edac/octeon_edac-lmc.c
@@ -7,7 +7,6 @@
* written by Ralf Baechle <[email protected]>
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/edac.h>
diff --git a/drivers/edac/octeon_edac-pc.c b/drivers/edac/octeon_edac-pc.c
index 0f83c33..e32cf48 100644
--- a/drivers/edac/octeon_edac-pc.c
+++ b/drivers/edac/octeon_edac-pc.c
@@ -9,7 +9,6 @@
* written by Ralf Baechle <[email protected]>
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/drivers/edac/octeon_edac-pci.c b/drivers/edac/octeon_edac-pci.c
index 9ca73ce..fdf0b42 100644
--- a/drivers/edac/octeon_edac-pci.c
+++ b/drivers/edac/octeon_edac-pci.c
@@ -8,7 +8,6 @@
* written by Ralf Baechle <[email protected]>
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/edac.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: "James E.J. Bottomley" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/scsi/aacraid/aachba.c | 1 -
drivers/scsi/aacraid/commctrl.c | 1 -
drivers/scsi/aacraid/comminit.c | 1 -
drivers/scsi/aacraid/commsup.c | 1 -
drivers/scsi/aacraid/dpcsup.c | 1 -
drivers/scsi/aacraid/rx.c | 1 -
drivers/scsi/aacraid/sa.c | 1 -
drivers/scsi/aacraid/src.c | 1 -
drivers/scsi/arcmsr/arcmsr_attr.c | 1 -
drivers/scsi/arm/msgqueue.c | 1 -
drivers/scsi/arm/queue.c | 1 -
drivers/scsi/bnx2fc/bnx2fc.h | 1 -
drivers/scsi/csiostor/csio_attr.c | 1 -
drivers/scsi/fdomain.c | 1 -
drivers/scsi/fnic/fnic_scsi.c | 1 -
drivers/scsi/hosts.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_base.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_config.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_transport.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_base.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_config.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_transport.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 -
drivers/scsi/qla2xxx/qla_def.h | 1 -
drivers/scsi/qla4xxx/ql4_def.h | 1 -
drivers/scsi/scsi_scan.c | 1 -
drivers/scsi/scsi_sysfs.c | 1 -
drivers/scsi/ufs/ufshcd.h | 1 -
drivers/scsi/wd33c93.c | 1 -
31 files changed, 31 deletions(-)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 681434e..c0e8b9e 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -25,7 +25,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index fbcd48d..abb98dc5 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -30,7 +30,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 177b094..bbe5077 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -31,7 +31,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index cab190a..e8ed86f 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -31,7 +31,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index d81b281..130939c 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -31,7 +31,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index dada38a..bdda9e8 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -30,7 +30,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 2244f31..585a855 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -30,7 +30,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 7e17107..7afb2b0 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -30,7 +30,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index acdae33..f3978f8 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -46,7 +46,6 @@
*/
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/arm/msgqueue.c b/drivers/scsi/arm/msgqueue.c
index 7c95c75..bcae7f0 100644
--- a/drivers/scsi/arm/msgqueue.c
+++ b/drivers/scsi/arm/msgqueue.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
-#include <linux/init.h>
#include "msgqueue.h"
diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index cb11cce..7ee1090 100644
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -21,7 +21,6 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/list.h>
-#include <linux/init.h>
#include "../scsi.h"
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 1ebf3fb..b753030 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -30,7 +30,6 @@
#include <linux/timer.h>
#include <linux/errno.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/workqueue.h>
#include <linux/mutex.h>
diff --git a/drivers/scsi/csiostor/csio_attr.c b/drivers/scsi/csiostor/csio_attr.c
index 065a87a..0a50452 100644
--- a/drivers/scsi/csiostor/csio_attr.c
+++ b/drivers/scsi/csiostor/csio_attr.c
@@ -36,7 +36,6 @@
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/mm.h>
#include <linux/jiffies.h>
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index fff6829..2b45368 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -267,7 +267,6 @@
**************************************************************************/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/blkdev.h>
#include <linux/spinlock.h>
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 0521436..697ba76 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -17,7 +17,6 @@
*/
#include <linux/mempool.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
#include <linux/scatterlist.h>
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index f28ea07..fb7be2b 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -28,7 +28,6 @@
#include <linux/kthread.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/init.h>
#include <linux/completion.h>
#include <linux/transport_class.h>
#include <linux/platform_device.h>
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index bde63f7..ab8c981 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -45,7 +45,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 0c47425..2fb88e9 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -43,7 +43,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index b7f887c..3b06d45 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -45,7 +45,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 410f4a3..3c6c23a 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -43,7 +43,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/workqueue.h>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 0cf4f70..6f2a90c 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -45,7 +45,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index 936ec03..e1712a6 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -43,7 +43,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 9b89de1..9b2b4b4 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -45,7 +45,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index 65170cb..ab69795 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -43,7 +43,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/workqueue.h>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c b/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
index f6533ab..1560a53 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
@@ -45,7 +45,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index e1fe95e..79bee11 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -8,7 +8,6 @@
#define __QLA_DEF_H
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/list.h>
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index aa67bb9..2c1d8db 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -9,7 +9,6 @@
#define __QL4_DEF_H
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/list.h>
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 307a811..7b02567 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -27,7 +27,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/kthread.h>
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 9117d0b..3fb9557 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -8,7 +8,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/device.h>
#include <linux/pm_runtime.h>
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 577679a..c63f717 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -38,7 +38,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/delay.h>
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 41883a8..3585315 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -80,7 +80,6 @@
#include <linux/string.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/blkdev.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Wolfram Sang <[email protected]>
Cc: Jean Delvare <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/i2c/algos/i2c-algo-bit.c | 1 -
drivers/i2c/algos/i2c-algo-pca.c | 1 -
drivers/i2c/algos/i2c-algo-pcf.c | 1 -
drivers/i2c/busses/i2c-ali1535.c | 1 -
drivers/i2c/busses/i2c-ali1563.c | 1 -
drivers/i2c/busses/i2c-ali15x3.c | 1 -
drivers/i2c/busses/i2c-amd756.c | 1 -
drivers/i2c/busses/i2c-amd8111.c | 1 -
drivers/i2c/busses/i2c-au1550.c | 1 -
drivers/i2c/busses/i2c-cbus-gpio.c | 1 -
drivers/i2c/busses/i2c-cpm.c | 1 -
drivers/i2c/busses/i2c-eg20t.c | 1 -
drivers/i2c/busses/i2c-exynos5.c | 1 -
drivers/i2c/busses/i2c-highlander.c | 1 -
drivers/i2c/busses/i2c-hydra.c | 1 -
drivers/i2c/busses/i2c-ibm_iic.c | 1 -
drivers/i2c/busses/i2c-iop3xx.c | 1 -
drivers/i2c/busses/i2c-isch.c | 1 -
drivers/i2c/busses/i2c-ismt.c | 1 -
drivers/i2c/busses/i2c-mpc.c | 1 -
drivers/i2c/busses/i2c-nforce2.c | 1 -
drivers/i2c/busses/i2c-ocores.c | 1 -
drivers/i2c/busses/i2c-octeon.c | 1 -
drivers/i2c/busses/i2c-pca-platform.c | 1 -
drivers/i2c/busses/i2c-piix4.c | 1 -
drivers/i2c/busses/i2c-pmcmsp.c | 1 -
drivers/i2c/busses/i2c-powermac.c | 1 -
drivers/i2c/busses/i2c-puv3.c | 1 -
drivers/i2c/busses/i2c-rcar.c | 1 -
drivers/i2c/busses/i2c-scmi.c | 1 -
drivers/i2c/busses/i2c-sh7760.c | 1 -
drivers/i2c/busses/i2c-simtec.c | 1 -
drivers/i2c/busses/i2c-sis630.c | 1 -
drivers/i2c/busses/i2c-sis96x.c | 1 -
drivers/i2c/busses/i2c-via.c | 1 -
drivers/i2c/busses/i2c-xiic.c | 1 -
drivers/i2c/busses/i2c-xlr.c | 1 -
drivers/i2c/busses/scx200_i2c.c | 1 -
drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 1 -
drivers/i2c/muxes/i2c-mux-gpio.c | 1 -
drivers/i2c/muxes/i2c-mux-pca9541.c | 1 -
drivers/i2c/muxes/i2c-mux-pca954x.c | 1 -
drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 -
43 files changed, 43 deletions(-)
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fad22b0..8c29f36 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/i2c.h>
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index f892a42..8b10f88 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -24,7 +24,6 @@
#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-pca.h>
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 5c23795..3437009 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -30,7 +30,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-pcf.h>
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 3f49181..7d60d3a 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -58,7 +58,6 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 84ccd94..4611e47 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -20,7 +20,6 @@
#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#define ALI1563_MAX_TIMEOUT 500
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 26bcc61..4823206 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -65,7 +65,6 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index e13e2aa..819d3c1 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -41,7 +41,6 @@
#include <linux/stddef.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index a44e6e7..f3d4d79 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/acpi.h>
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index b5b8923..8762458 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/i2c/busses/i2c-cbus-gpio.c b/drivers/i2c/busses/i2c-cbus-gpio.c
index ce7ffba..bdf040f 100644
--- a/drivers/i2c/busses/i2c-cbus-gpio.c
+++ b/drivers/i2c/busses/i2c-cbus-gpio.c
@@ -19,7 +19,6 @@
#include <linux/io.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 3e5ea2c..be7f0a2 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -33,7 +33,6 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/stddef.h>
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index ff15ae9..e08e458 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -18,7 +18,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/i2c.h>
#include <linux/fs.h>
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 044f85b..9fd711c 100644
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/time.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 436b0f2..512fcfa 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -12,7 +12,6 @@
* of this archive for more details.
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 79c3d90..e248257 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -27,7 +27,6 @@
#include <linux/types.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <asm/hydra.h>
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index f744410..274312c 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -36,7 +36,6 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <asm/irq.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index dd24aa0..3d16c2f 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -34,7 +34,6 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c
index af21304..cf99dbf 100644
--- a/drivers/i2c/busses/i2c-isch.c
+++ b/drivers/i2c/busses/i2c-isch.c
@@ -33,7 +33,6 @@
#include <linux/stddef.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/acpi.h>
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index bb132ea..8ce4f51 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -62,7 +62,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index b6a741c..f539163 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
-#include <linux/init.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index ac88f40..0038c45 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -51,7 +51,6 @@
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/dmi.h>
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index c61f37a..80e06fa 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -15,7 +15,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index b929ba2..81042b0 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -18,7 +18,6 @@
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/io.h>
#include <linux/of.h>
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 39e2755..845f125 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -12,7 +12,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index a028617..66eaed9 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -38,7 +38,6 @@
#include <linux/ioport.h>
#include <linux/i2c.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index f6389e2..8564768 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 8c87f4a..01e9677 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/of_irq.h>
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
index ac80199..c83fc3c 100644
--- a/drivers/i2c/busses/i2c-puv3.c
+++ b/drivers/i2c/busses/i2c-puv3.c
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 2c2fd7c..4f5be21 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -26,7 +26,6 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/i2c.h>
diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index 5992355..dfc98df 100644
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -12,7 +12,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/acpi.h>
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 5e8f136..d76f3d9 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -11,7 +11,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 4fc87e7..294c80f 100644
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 36a9556..19b8505 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -45,7 +45,6 @@
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index b9faf9b..f8aa0c2 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -36,7 +36,6 @@
#include <linux/stddef.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index be66251..49d7f14 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/io.h>
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 6f9918f..2810750 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -30,7 +30,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-xlr.c b/drivers/i2c/busses/i2c-xlr.c
index 7945b05..17f7352 100644
--- a/drivers/i2c/busses/i2c-xlr.c
+++ b/drivers/i2c/busses/i2c-xlr.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index ae1258b..8eadf0f4 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/io.h>
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index c58e093..69afffa 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/of_gpio.h>
#include <linux/platform_device.h>
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 8a8c56f..d8989c8 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -12,7 +12,6 @@
#include <linux/i2c-mux.h>
#include <linux/i2c-mux-gpio.h>
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/gpio.h>
diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
index c4f08ad..cb77277 100644
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -17,7 +17,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index e835304..c5ac5f8 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -40,7 +40,6 @@
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
#include <linux/i2c/pca954x.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/of_gpio.h>
#include <linux/slab.h>
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index d7978dc..4ff0ef3 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -18,7 +18,6 @@
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pinctrl/consumer.h>
#include <linux/i2c-mux-pinctrl.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: David Airlie <[email protected]>
Cc: Matt Mackall <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: Kukjin Kim <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: Chris Metcalf <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Peter Huewe <[email protected]>
Cc: Ashley Lai <[email protected]>
Cc: Marcel Selhorst <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/char/agp/frontend.c | 1 -
drivers/char/agp/generic.c | 1 -
drivers/char/agp/intel-gtt.c | 1 -
drivers/char/agp/sgi-agp.c | 1 -
drivers/char/hw_random/bcm2835-rng.c | 1 -
drivers/char/hw_random/core.c | 1 -
drivers/char/hw_random/exynos-rng.c | 1 -
drivers/char/hw_random/n2-drv.c | 1 -
drivers/char/hw_random/nomadik-rng.c | 1 -
drivers/char/hw_random/octeon-rng.c | 1 -
drivers/char/ipmi/ipmi_si_intf.c | 1 -
drivers/char/mwave/3780i.c | 1 -
drivers/char/tile-srom.c | 1 -
drivers/char/tpm/tpm_i2c_infineon.c | 1 -
drivers/char/tpm/tpm_i2c_stm_st33.c | 1 -
15 files changed, 15 deletions(-)
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 1b19239..8121b4c 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -31,7 +31,6 @@
#include <linux/module.h>
#include <linux/mman.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/agp_backend.h>
#include <linux/agpgart.h>
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f39437a..0fbccce 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -29,7 +29,6 @@
*/
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/pagemap.h>
#include <linux/miscdevice.h>
#include <linux/pm.h>
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 5c85350..9a024f8 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pagemap.h>
#include <linux/agp_backend.h>
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index 05b8d02..3051c73 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/agp_backend.h>
#include <asm/sn/addrs.h>
#include <asm/sn/io.h>
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
index 43577ca..8c3b255 100644
--- a/drivers/char/hw_random/bcm2835-rng.c
+++ b/drivers/char/hw_random/bcm2835-rng.c
@@ -8,7 +8,6 @@
*/
#include <linux/hw_random.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index a0f7724..b9495a8 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/sched.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c
index 402ccfb..9f8277c 100644
--- a/drivers/char/hw_random/exynos-rng.c
+++ b/drivers/char/hw_random/exynos-rng.c
@@ -22,7 +22,6 @@
#include <linux/hw_random.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index f9beed5..432232e 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -7,7 +7,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/preempt.h>
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index 232b87f..00e9d2d 100644
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/amba/bus.h>
#include <linux/hw_random.h>
diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index f2885db..b5cc342 100644
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
@@ -10,7 +10,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/device.h>
#include <linux/hw_random.h>
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 15e4a60..4a2d7c6 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -61,7 +61,6 @@
#include <linux/ipmi_smi.h>
#include <asm/io.h>
#include "ipmi_si_sm.h"
-#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/string.h>
#include <linux/ctype.h>
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 881c9e5..2874004 100644
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -50,7 +50,6 @@
#include <linux/unistd.h>
#include <linux/delay.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/sched.h> /* cond_resched() */
diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c
index 0e506ba..bd37747 100644
--- a/drivers/char/tile-srom.c
+++ b/drivers/char/tile-srom.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/kernel.h> /* printk() */
#include <linux/slab.h> /* kmalloc() */
#include <linux/fs.h> /* everything... */
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 52b9b2b..472af4b 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -21,7 +21,6 @@
*
*
*/
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/wait.h>
diff --git a/drivers/char/tpm/tpm_i2c_stm_st33.c b/drivers/char/tpm/tpm_i2c_stm_st33.c
index 5b0dd8e..3b7bf21 100644
--- a/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -38,7 +38,6 @@
#include <linux/miscdevice.h>
#include <linux/kernel.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/wait.h>
#include <linux/string.h>
#include <linux/interrupt.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Bryan Wu <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/leds/led-triggers.c | 1 -
drivers/leds/leds-88pm860x.c | 1 -
drivers/leds/leds-adp5520.c | 1 -
drivers/leds/leds-asic3.c | 1 -
drivers/leds/leds-blinkm.c | 1 -
drivers/leds/leds-cobalt-qube.c | 1 -
drivers/leds/leds-da903x.c | 1 -
drivers/leds/leds-da9052.c | 1 -
drivers/leds/leds-fsg.c | 1 -
drivers/leds/leds-gpio.c | 1 -
drivers/leds/leds-hp6xx.c | 1 -
drivers/leds/leds-lm3533.c | 1 -
drivers/leds/leds-lp5521.c | 1 -
drivers/leds/leds-lp5523.c | 1 -
drivers/leds/leds-lp5562.c | 1 -
drivers/leds/leds-lt3593.c | 1 -
drivers/leds/leds-mc13783.c | 1 -
drivers/leds/leds-netxbig.c | 1 -
drivers/leds/leds-ns2.c | 1 -
drivers/leds/leds-ot200.c | 1 -
drivers/leds/leds-pwm.c | 1 -
drivers/leds/leds-s3c24xx.c | 1 -
drivers/leds/leds-wm831x-status.c | 1 -
drivers/leds/leds-wm8350.c | 1 -
24 files changed, 24 deletions(-)
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index e387f41..df1a7c1 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/device.h>
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 5f588c0..d1e1bca 100644
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -11,7 +11,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index 7e311a1..86b5bdb 100644
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/workqueue.h>
diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 6de216a..70c74a7 100644
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -7,7 +7,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/slab.h>
diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index 66d0a57..0c50860 100644
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index 8abcb66..910339d 100644
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -3,7 +3,6 @@
*
* Control the Cobalt Qube/RaQ front LED
*/
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/leds.h>
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 2a4b87f..35dffb1 100644
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/workqueue.h>
diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
index 865d4fa..01486ad 100644
--- a/drivers/leds/leds-da9052.c
+++ b/drivers/leds/leds-da9052.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/workqueue.h>
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
index b4d5a44..2b4dc73 100644
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
@@ -16,7 +16,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/module.h>
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 78b0e27..3f65a08 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -11,7 +11,6 @@
*
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/leds.h>
diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
index 366b605..d61a988 100644
--- a/drivers/leds/leds-hp6xx.c
+++ b/drivers/leds/leds-hp6xx.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <asm/hd64461.h>
diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index 027ede7..e2c642c11 100644
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/leds.h>
#include <linux/mfd/core.h>
#include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 2ec34cf..8ca197a 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -25,7 +25,6 @@
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 4ade66a..cb5ed82 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -25,7 +25,6 @@
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index bf006f4..315d3ca 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -13,7 +13,6 @@
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index 3417e5b..059f5b1 100644
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -17,7 +17,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/workqueue.h>
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index ca87a1b..dca34c7 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/workqueue.h>
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 2f9f141..e97f443 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index c7a4230..efa6258 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -23,7 +23,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/gpio.h>
diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
index 98cae52..c9d9060 100644
--- a/drivers/leds/leds-ot200.c
+++ b/drivers/leds/leds-ot200.c
@@ -8,7 +8,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/leds.h>
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index 6050474..dd17873 100644
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/of_platform.h>
#include <linux/fb.h>
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 98174e7..28988b7 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -12,7 +12,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/gpio.h>
diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index 0a1a13f..e72c974 100644
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -10,7 +10,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/leds.h>
diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index 3f75fd2..4133ffe 100644
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -10,7 +10,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/err.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/gpu/drm/ast/ast_fb.c | 1 -
drivers/gpu/drm/drm_dp_helper.c | 1 -
drivers/gpu/drm/gma500/accel_2d.c | 1 -
drivers/gpu/drm/gma500/framebuffer.c | 1 -
drivers/gpu/drm/i915/intel_fbdev.c | 1 -
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 -
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 -
7 files changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index 7b33e14..e4a35c1 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -34,7 +34,6 @@
#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <drm/drmP.h>
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 9e978aa..d96e445 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/i2c.h>
diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
index de6f62a..426e8dd 100644
--- a/drivers/gpu/drm/gma500/accel_2d.c
+++ b/drivers/gpu/drm/gma500/accel_2d.c
@@ -29,7 +29,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/console.h>
#include <drm/drmP.h>
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 94b3fec..6a3aa1b 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -26,7 +26,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/console.h>
#include <drm/drmP.h>
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 39eac99..de80c29 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -33,7 +33,6 @@
#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/vga_switcheroo.h>
#include <drm/drmP.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 7903e0e..3da3999 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -33,7 +33,6 @@
#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/screen_info.h>
#include <linux/vga_switcheroo.h>
#include <linux/console.h>
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 701c4c1..d7f1c85 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -15,7 +15,6 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h> /* platform_device() */
#include <linux/errno.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Anton Vorontsov <[email protected]>
Cc: David Woodhouse <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/power/abx500_chargalg.c | 1 -
drivers/power/da9030_battery.c | 1 -
drivers/power/generic-adc-battery.c | 1 -
drivers/power/gpio-charger.c | 1 -
drivers/power/intel_mid_battery.c | 1 -
drivers/power/isp1704_charger.c | 1 -
drivers/power/max17040_battery.c | 1 -
drivers/power/max17042_battery.c | 1 -
drivers/power/pcf50633-charger.c | 1 -
drivers/power/reset/gpio-poweroff.c | 1 -
drivers/power/reset/restart-poweroff.c | 1 -
drivers/power/s3c_adc_battery.c | 1 -
drivers/power/sbs-battery.c | 1 -
drivers/power/smb347-charger.c | 1 -
drivers/power/tps65090-charger.c | 1 -
drivers/power/wm97xx_battery.c | 1 -
16 files changed, 16 deletions(-)
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 6d27236..6f20748 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -12,7 +12,6 @@
* Author: Imre Sunyi <[email protected]>
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/hrtimer.h>
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c
index ae6c418..9fde83a 100644
--- a/drivers/power/da9030_battery.c
+++ b/drivers/power/da9030_battery.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/device.h>
#include <linux/workqueue.h>
diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
index 59a1421..d37bb1a 100644
--- a/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@ -17,7 +17,6 @@
#include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/iio/consumer.h>
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index a0024b2..13a42aa 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -15,7 +15,6 @@
#include <linux/device.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 4520811..d470136 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 80edb7d..2c71520 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/device.h>
#include <linux/sysfs.h>
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c
index c7ff6d6..7761290 100644
--- a/drivers/power/max17040_battery.c
+++ b/drivers/power/max17040_battery.c
@@ -11,7 +11,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/err.h>
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 66da691..3dfbf31 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -22,7 +22,6 @@
* This driver is based on max17040_battery.c
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 771c4f0..fb23d05 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/device.h>
#include <linux/sysfs.h>
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index e290d48..492da85 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -12,7 +12,6 @@
*
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index 5758033..ff005fb 100644
--- a/drivers/power/reset/restart-poweroff.c
+++ b/drivers/power/reset/restart-poweroff.c
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/of_platform.h>
#include <linux/module.h>
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index 5948ce0..1039c12 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -19,7 +19,6 @@
#include <linux/jiffies.h>
#include <linux/s3c_adc_battery.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <plat/adc.h>
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index b5f2a76..d6e4708 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -18,7 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/err.h>
diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index acf84e8..4c48401 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -15,7 +15,6 @@
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/i2c.h>
#include <linux/mutex.h>
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 8fc9d6d..d03e740 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -17,7 +17,6 @@
*/
#include <linux/delay.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 58f7348..15ab484 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -13,7 +13,6 @@
*
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
This covers off all the remaining scattered instances in drivers
in order to avoid a bunch more separate smaller commits.
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/atm/idt77105.c | 1 -
drivers/atm/suni.c | 1 -
drivers/block/nvme-scsi.c | 1 -
drivers/clk/mxs/clk-ssp.c | 1 -
drivers/cpuidle/cpuidle-kirkwood.c | 1 -
drivers/extcon/extcon-gpio.c | 1 -
drivers/firewire/nosy.c | 1 -
drivers/firewire/ohci.c | 1 -
drivers/firmware/efi/vars.c | 1 -
drivers/fmc/fmc-chardev.c | 1 -
drivers/fmc/fmc-core.c | 1 -
drivers/fmc/fmc-fakedev.c | 1 -
drivers/fmc/fmc-trivial.c | 1 -
drivers/fmc/fmc-write-eeprom.c | 1 -
drivers/hid/usbhid/hiddev.c | 1 -
drivers/hid/usbhid/usbkbd.c | 1 -
drivers/hid/usbhid/usbmouse.c | 1 -
drivers/ide/delkin_cb.c | 1 -
drivers/ide/ide-io.c | 1 -
drivers/ide/setup-pci.c | 1 -
drivers/lguest/lg.h | 1 -
drivers/md/bitmap.c | 1 -
drivers/md/dm-region-hash.c | 1 -
drivers/message/fusion/mptlan.h | 1 -
drivers/message/fusion/mptscsih.c | 1 -
drivers/ntb/ntb_hw.c | 1 -
drivers/of/device.c | 1 -
drivers/oprofile/timer_int.c | 1 -
drivers/parisc/eisa_enumerator.c | 1 -
drivers/parport/parport_cs.c | 1 -
drivers/parport/parport_gsc.c | 1 -
drivers/parport/parport_sunbpp.c | 1 -
drivers/pnp/manager.c | 1 -
drivers/pnp/pnpbios/bioscalls.c | 1 -
drivers/pps/clients/pps-gpio.c | 1 -
drivers/pps/kapi.c | 1 -
drivers/pps/kc.c | 1 -
drivers/pwm/pwm-atmel-tcb.c | 1 -
drivers/pwm/pwm-renesas-tpu.c | 1 -
drivers/rapidio/devices/tsi721_dma.c | 1 -
drivers/rapidio/rio.c | 1 -
drivers/regulator/ab8500-ext.c | 1 -
drivers/regulator/arizona-ldo1.c | 1 -
drivers/regulator/arizona-micsupp.c | 1 -
drivers/regulator/mc13xxx-regulator-core.c | 1 -
drivers/regulator/wm8994-regulator.c | 1 -
drivers/target/target_core_fabric_configfs.c | 1 -
drivers/target/tcm_fc/tfc_cmd.c | 1 -
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 1 -
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 1 -
drivers/uio/uio_aec.c | 1 -
drivers/uwb/beacon.c | 1 -
drivers/uwb/hwa-rc.c | 1 -
drivers/vlynq/vlynq.c | 1 -
drivers/w1/masters/ds2482.c | 1 -
drivers/w1/masters/w1-gpio.c | 1 -
drivers/xen/xen-stub.c | 1 -
58 files changed, 58 deletions(-)
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 45d5063..e792482 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -11,7 +11,6 @@
#include <linux/sonet.h>
#include <linux/delay.h>
#include <linux/timer.h>
-#include <linux/init.h>
#include <linux/capability.h>
#include <linux/atm_idt77105.h>
#include <linux/spinlock.h>
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 0215934..bc79c9f 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -18,7 +18,6 @@
#include <linux/sonet.h>
#include <linux/delay.h>
#include <linux/timer.h>
-#include <linux/init.h>
#include <linux/capability.h>
#include <linux/atm_suni.h>
#include <linux/slab.h>
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index 4a4ff4e..1ce4223 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -30,7 +30,6 @@
#include <linux/fs.h>
#include <linux/genhd.h>
#include <linux/idr.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kdev_t.h>
diff --git a/drivers/clk/mxs/clk-ssp.c b/drivers/clk/mxs/clk-ssp.c
index af7bdbf..a57f0ba 100644
--- a/drivers/clk/mxs/clk-ssp.c
+++ b/drivers/clk/mxs/clk-ssp.c
@@ -17,7 +17,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <linux/module.h>
#include <linux/device.h>
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 41ba843..1c88bfd 100644
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/cpuidle.h>
#include <linux/io.h>
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index a63a6b2..d5b6d55 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index 76b2d39..a33ae46 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -20,7 +20,6 @@
#include <linux/device.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6f74d8d..f27efbe 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -26,7 +26,6 @@
#include <linux/dma-mapping.h>
#include <linux/firewire.h>
#include <linux/firewire-constants.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index b22659c..ba7f316 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -22,7 +22,6 @@
#include <linux/capability.h>
#include <linux/types.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/fmc/fmc-chardev.c b/drivers/fmc/fmc-chardev.c
index ace6ef2..7a055ad 100644
--- a/drivers/fmc/fmc-chardev.c
+++ b/drivers/fmc/fmc-chardev.c
@@ -8,7 +8,6 @@
* by CERN, the European Institute for Nuclear Research.
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/fs.h>
diff --git a/drivers/fmc/fmc-core.c b/drivers/fmc/fmc-core.c
index 24d5249..5f0a15c 100644
--- a/drivers/fmc/fmc-core.c
+++ b/drivers/fmc/fmc-core.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/fmc.h>
diff --git a/drivers/fmc/fmc-fakedev.c b/drivers/fmc/fmc-fakedev.c
index 941d093..9144596 100644
--- a/drivers/fmc/fmc-fakedev.c
+++ b/drivers/fmc/fmc-fakedev.c
@@ -11,7 +11,6 @@
* applicable law.
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/device.h>
#include <linux/slab.h>
diff --git a/drivers/fmc/fmc-trivial.c b/drivers/fmc/fmc-trivial.c
index 6c590f5..611a05b 100644
--- a/drivers/fmc/fmc-trivial.c
+++ b/drivers/fmc/fmc-trivial.c
@@ -13,7 +13,6 @@
/* A trivial fmc driver that can load a gateware file and reports interrupts */
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fmc.h>
diff --git a/drivers/fmc/fmc-write-eeprom.c b/drivers/fmc/fmc-write-eeprom.c
index ee5b479..30e451e 100644
--- a/drivers/fmc/fmc-write-eeprom.c
+++ b/drivers/fmc/fmc-write-eeprom.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/firmware.h>
-#include <linux/init.h>
#include <linux/fmc.h>
#include <asm/unaligned.h>
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 2f1ddca..2cad378 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -28,7 +28,6 @@
#include <linux/poll.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/hid.h>
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 9a332e6..30c236b 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/usb/input.h>
#include <linux/hid.h>
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index bf16d72..c3a2e29 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/usb/input.h>
#include <linux/hid.h>
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c
index 300daab..9ab3268 100644
--- a/drivers/ide/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
@@ -20,7 +20,6 @@
#include <linux/types.h>
#include <linux/module.h>
#include <linux/ide.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <asm/io.h>
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 177db6d..954a5a2 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -36,7 +36,6 @@
#include <linux/genhd.h>
#include <linux/blkpg.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/ide.h>
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 34a5e52..3518548 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/export.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ide.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 2eef40b..b517698 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -3,7 +3,6 @@
#ifndef __ASSEMBLY__
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/stringify.h>
#include <linux/lguest.h>
#include <linux/lguest_launcher.h>
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 4195a01..5d89cce 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -19,7 +19,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/timer.h>
#include <linux/sched.h>
#include <linux/list.h>
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
index b929fd5..9d44713 100644
--- a/drivers/md/dm-region-hash.c
+++ b/drivers/md/dm-region-hash.c
@@ -9,7 +9,6 @@
#include <linux/dm-region-hash.h>
#include <linux/ctype.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 69e9d54..3a483a5 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -62,7 +62,6 @@
// #include <linux/fddidevice.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/miscdevice.h>
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 727819c..459192cd 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -47,7 +47,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kdev_t.h>
#include <linux/blkdev.h>
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index 170e8e6..71fe171 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -47,7 +47,6 @@
*/
#include <linux/debugfs.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/of/device.c b/drivers/of/device.c
index dafb973..cf1b8ea 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -2,7 +2,6 @@
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/slab.h>
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 61be1d9..9d728e6 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -12,7 +12,6 @@
#include <linux/smp.h>
#include <linux/oprofile.h>
#include <linux/profile.h>
-#include <linux/init.h>
#include <linux/cpu.h>
#include <linux/hrtimer.h>
#include <asm/irq_regs.h>
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index caa1531..e72fca6 100644
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -11,7 +11,6 @@
*/
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <asm/io.h>
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index e9b52e4..e109d76 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 6e3a60c..bad80a3 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -22,7 +22,6 @@
#undef DEBUG /* undef for production */
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index dffd6d0b..5a7e51f 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -25,7 +25,6 @@
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 9357aa7..01db66f 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -9,7 +9,6 @@
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pnp.h>
#include <linux/bitmap.h>
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index 769d265..6665b91 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -4,7 +4,6 @@
#include <linux/types.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/kernel.h>
#include <linux/device.h>
diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
index f41bacf..d849aa3 100644
--- a/drivers/pps/clients/pps-gpio.c
+++ b/drivers/pps/clients/pps-gpio.c
@@ -23,7 +23,6 @@
#define PPS_GPIO_NAME "pps-gpio"
#define pr_fmt(fmt) PPS_GPIO_NAME ": " fmt
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index cdad4d9..a19e137 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/time.h>
#include <linux/timex.h>
diff --git a/drivers/pps/kc.c b/drivers/pps/kc.c
index e219db1..256401f 100644
--- a/drivers/pps/kc.c
+++ b/drivers/pps/kc.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/pps_kernel.h>
diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c
index f3dcd02..54d1800 100644
--- a/drivers/pwm/pwm-atmel-tcb.c
+++ b/drivers/pwm/pwm-atmel-tcb.c
@@ -6,7 +6,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/clocksource.h>
#include <linux/clockchips.h>
#include <linux/interrupt.h>
diff --git a/drivers/pwm/pwm-renesas-tpu.c b/drivers/pwm/pwm-renesas-tpu.c
index aff6ba9..7ecdd5d 100644
--- a/drivers/pwm/pwm-renesas-tpu.c
+++ b/drivers/pwm/pwm-renesas-tpu.c
@@ -16,7 +16,6 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/rapidio/devices/tsi721_dma.c b/drivers/rapidio/devices/tsi721_dma.c
index 502663f..3c7e563 100644
--- a/drivers/rapidio/devices/tsi721_dma.c
+++ b/drivers/rapidio/devices/tsi721_dma.c
@@ -21,7 +21,6 @@
#include <linux/io.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 2e8a20c..d202e31 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/rio.h>
#include <linux/rio_drv.h>
#include <linux/rio_ids.h>
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 29c0faa..741c999 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -12,7 +12,6 @@
* ab8500-ext supports the following regulators:
* - VextSupply3
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/module.h>
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 4f6c205..69bc957 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/platform_device.h>
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index 034ece7..daf6b45 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/platform_device.h>
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index da48592..41915da 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -22,7 +22,6 @@
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/of.h>
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 71c5911..b195a3e 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/platform_device.h>
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 7de9f04..0ea1889 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/utsname.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/slab.h>
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 479ec56..99daa16 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/utsname.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/kthread.h>
#include <linux/types.h>
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index e415af3..4a460cb 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -29,7 +29,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/utsname.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/kthread.h>
#include <linux/types.h>
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index ae52c08..23201a9 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/utsname.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/kthread.h>
#include <linux/types.h>
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 74c0e34..5e4f432 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -25,7 +25,6 @@
#include <linux/module.h>
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/clk.h>
diff --git a/drivers/uio/uio_aec.c b/drivers/uio/uio_aec.c
index 1549fab..2dbc795 100644
--- a/drivers/uio/uio_aec.c
+++ b/drivers/uio/uio_aec.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/cdev.h>
#include <linux/fs.h>
diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 57b5ff6..511576e 100644
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -23,7 +23,6 @@
* FIXME: docs
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/err.h>
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c
index 0257f35..fa986bd 100644
--- a/drivers/uwb/hwa-rc.c
+++ b/drivers/uwb/hwa-rc.c
@@ -51,7 +51,6 @@
*
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/usb.h>
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c
index c0227f9..0530d7f 100644
--- a/drivers/vlynq/vlynq.c
+++ b/drivers/vlynq/vlynq.c
@@ -19,7 +19,6 @@
* http://www.ti.com/litv/pdf/sprue36a
*/
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c
index e033491..263a950 100644
--- a/drivers/w1/masters/ds2482.c
+++ b/drivers/w1/masters/ds2482.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/delay.h>
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 9709b8b..2469045 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -8,7 +8,6 @@
* as published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
diff --git a/drivers/xen/xen-stub.c b/drivers/xen/xen-stub.c
index bbef194..a9630da 100644
--- a/drivers/xen/xen-stub.c
+++ b/drivers/xen/xen-stub.c
@@ -21,7 +21,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/types.h>
#include <linux/acpi.h>
--
1.8.4.1
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 <[email protected]>
---
include/drm/drmP.h | 2 +-
include/linux/fb.h | 1 -
include/linux/ide.h | 1 -
include/linux/kdb.h | 1 -
include/linux/lsm_audit.h | 1 -
include/linux/moduleparam.h | 1 -
include/linux/netfilter.h | 1 -
include/linux/nls.h | 2 +-
include/linux/percpu_ida.h | 1 -
include/linux/profile.h | 1 -
include/linux/pstore_ram.h | 1 -
include/linux/usb/gadget.h | 1 -
include/linux/zorro.h | 1 -
include/xen/xenbus.h | 1 -
14 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 63eab2b..c883f41 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -45,7 +45,7 @@
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
-#include <linux/init.h>
+#include <linux/proc_fs.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 fe6ac95..a23ab6c 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 93b5ca7..9aa3e3a 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 290db12..8718e15 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 1cc89e9..da30bf5 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 c3eb102..72e584b 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 2077489..e4f2878 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 5dc635f..da8c447 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 1900bd0..bc706f1 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/spinlock_types.h>
#include <linux/wait.h>
#include <linux/cpumask.h>
diff --git a/include/linux/profile.h b/include/linux/profile.h
index aaad386..dc04999 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 9974975..1c1b44e 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 c3a6185..4300742 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/linux/zorro.h b/include/linux/zorro.h
index 63fbba0..529604b 100644
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -15,7 +15,6 @@
#include <uapi/linux/zorro.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/mod_devicetable.h>
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index 569c07f..094ffa1 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>
--
1.8.4.1
Currently these two RTC devices are in core platform code
where it is not possible for them to be modular. It will
never be modular, so using module_init as an alias for
__initcall can be somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- they will remain at level 6 in initcall ordering.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Geoff Levand <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/kernel/time.c | 2 +-
arch/powerpc/platforms/ps3/time.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index b3dab20..63b34fc 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -1064,4 +1064,4 @@ static int __init rtc_init(void)
return PTR_ERR_OR_ZERO(pdev);
}
-module_init(rtc_init);
+device_initcall(rtc_init);
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index ce73ce8..791c614 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -92,5 +92,4 @@ static int __init ps3_rtc_init(void)
return PTR_ERR_OR_ZERO(pdev);
}
-
-module_init(ps3_rtc_init);
+device_initcall(ps3_rtc_init);
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Pavel Machek <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Len Brown <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/base/attribute_container.c | 1 -
drivers/base/power/clock_ops.c | 1 -
drivers/base/power/common.c | 1 -
drivers/base/power/domain.c | 1 -
drivers/base/power/domain_governor.c | 1 -
drivers/base/power/opp.c | 1 -
drivers/base/regmap/regmap-i2c.c | 1 -
drivers/base/regmap/regmap-mmio.c | 1 -
drivers/base/regmap/regmap-spi.c | 1 -
drivers/base/topology.c | 1 -
10 files changed, 10 deletions(-)
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index ecc1929..b84ca8f 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -12,7 +12,6 @@
*/
#include <linux/attribute_container.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/slab.h>
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index e870bbe..b99e6c0 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -6,7 +6,6 @@
* This file is released under the GPLv2.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/io.h>
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 5da9140..df2e5ee 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -6,7 +6,6 @@
* This file is released under the GPLv2.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/export.h>
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index bfb8955..921b192 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -6,7 +6,6 @@
* This file is released under the GPLv2.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
index 28dee30..a089e3b 100644
--- a/drivers/base/power/domain_governor.c
+++ b/drivers/base/power/domain_governor.c
@@ -6,7 +6,6 @@
* This file is released under the GPLv2.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pm_domain.h>
#include <linux/pm_qos.h>
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
index fa41874..2553867 100644
--- a/drivers/base/power/opp.c
+++ b/drivers/base/power/opp.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/cpufreq.h>
#include <linux/device.h>
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index fa6bf52..ebd1895 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -13,7 +13,6 @@
#include <linux/regmap.h>
#include <linux/i2c.h>
#include <linux/module.h>
-#include <linux/init.h>
static int regmap_i2c_write(void *context, const void *data, size_t count)
{
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 81f9775..4410cb2 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -18,7 +18,6 @@
#include <linux/clk.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/regmap.h>
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 37f12ae..0eb3097 100644
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -12,7 +12,6 @@
#include <linux/regmap.h>
#include <linux/spi/spi.h>
-#include <linux/init.h>
#include <linux/module.h>
#include "internal.h"
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 94ffee3..ad9d177 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -23,7 +23,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/cpu.h>
#include <linux/module.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Vinod Koul <[email protected]>
Cc: Laxman Dewangan <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/dma/bcm2835-dma.c | 1 -
drivers/dma/dma-jz4740.c | 1 -
drivers/dma/dw/core.c | 1 -
drivers/dma/ioat/dma.c | 1 -
drivers/dma/ioat/dma.h | 1 -
drivers/dma/ioat/dma_v2.c | 1 -
drivers/dma/iop-adma.c | 1 -
drivers/dma/k3dma.c | 1 -
drivers/dma/mmp_pdma.c | 1 -
drivers/dma/mmp_tdma.c | 1 -
drivers/dma/omap-dma.c | 1 -
drivers/dma/pch_dma.c | 1 -
drivers/dma/pl330.c | 1 -
drivers/dma/sh/rcar-hpbdma.c | 1 -
drivers/dma/sh/sudmac.c | 1 -
drivers/dma/tegra20-apb-dma.c | 1 -
drivers/dma/timb_dma.c | 1 -
17 files changed, 17 deletions(-)
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index a036021..124f5cf 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -32,7 +32,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/module.h>
diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c
index 94c380f..3e49f2c 100644
--- a/drivers/dma/dma-jz4740.c
+++ b/drivers/dma/dma-jz4740.c
@@ -16,7 +16,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 13ac3f2..7109375 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -17,7 +17,6 @@
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mm.h>
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 8752918..45554f9 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -25,7 +25,6 @@
* copy operations.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/pci.h>
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 11fb877..6a8f169 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -24,7 +24,6 @@
#include <linux/dmaengine.h>
#include "hw.h"
#include "registers.h"
-#include <linux/init.h>
#include <linux/dmapool.h>
#include <linux/cache.h>
#include <linux/pci_ids.h>
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c
index 5d3affe..659e535 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
@@ -25,7 +25,6 @@
* does asynchronous data movement and checksumming operations.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/pci.h>
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index c56137b..8d69f6c 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -22,7 +22,6 @@
* on the Intel Xscale(R) family of I/O Processors (IOP 32x, 33x, 134x)
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index a1f911a..1004819 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -9,7 +9,6 @@
#include <linux/sched.h>
#include <linux/device.h>
#include <linux/dmaengine.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index c1b7c3a..32e58ee 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -8,7 +8,6 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 33f96aa..dba6189 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -11,7 +11,6 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 362e7c4..f16e718 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -8,7 +8,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/module.h>
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 61fdc54..83344cf 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -19,7 +19,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 73fa9b7..32abac3 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/io.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
index 3083d90..8a7b9ba 100644
--- a/drivers/dma/sh/rcar-hpbdma.c
+++ b/drivers/dma/sh/rcar-hpbdma.c
@@ -18,7 +18,6 @@
#include <linux/dmaengine.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/platform_data/dma-rcar-hpbdma.h>
diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
index c7e9cdf..5c35337 100644
--- a/drivers/dma/sh/sudmac.c
+++ b/drivers/dma/sh/sudmac.c
@@ -14,7 +14,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 03ad64e..ff269dd 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -22,7 +22,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mm.h>
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 4506a7b..3ef05d6 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -22,7 +22,6 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/module.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Kevin Hilman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Viresh Kumar <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/cpufreq/omap-cpufreq.c | 1 -
drivers/cpufreq/powernow-k8.c | 1 -
drivers/cpufreq/s3c2412-cpufreq.c | 1 -
drivers/cpufreq/s3c2440-cpufreq.c | 1 -
drivers/cpufreq/spear-cpufreq.c | 1 -
drivers/cpufreq/speedstep-lib.c | 1 -
6 files changed, 6 deletions(-)
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 590f5b6..6febc15 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -18,7 +18,6 @@
#include <linux/sched.h>
#include <linux/cpufreq.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index e10b646..386c4ad 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -30,7 +30,6 @@
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/cpufreq/s3c2412-cpufreq.c b/drivers/cpufreq/s3c2412-cpufreq.c
index 4645b48..8f42bac 100644
--- a/drivers/cpufreq/s3c2412-cpufreq.c
+++ b/drivers/cpufreq/s3c2412-cpufreq.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/drivers/cpufreq/s3c2440-cpufreq.c b/drivers/cpufreq/s3c2440-cpufreq.c
index f84ed10..1aade6d 100644
--- a/drivers/cpufreq/s3c2440-cpufreq.c
+++ b/drivers/cpufreq/s3c2440-cpufreq.c
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 5c86e3f..f481597 100644
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -16,7 +16,6 @@
#include <linux/clk.h>
#include <linux/cpufreq.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/slab.h>
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c
index 7047821..1ef6fb6 100644
--- a/drivers/cpufreq/speedstep-lib.c
+++ b/drivers/cpufreq/speedstep-lib.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/cpufreq.h>
#include <asm/msr.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Roland Dreier <[email protected]>
Cc: Sean Hefty <[email protected]>
Cc: Hal Rosenstock <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/infiniband/hw/amso1100/c2.c | 1 -
drivers/infiniband/hw/amso1100/c2_pd.c | 1 -
drivers/infiniband/hw/amso1100/c2_provider.c | 1 -
drivers/infiniband/hw/amso1100/c2_rnic.c | 1 -
drivers/infiniband/hw/mlx4/alias_GUID.c | 1 -
drivers/infiniband/hw/nes/nes_cm.c | 1 -
drivers/infiniband/hw/nes/nes_utils.c | 1 -
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index d53cf51..b191058 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -45,7 +45,6 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/tcp.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/prefetch.h>
diff --git a/drivers/infiniband/hw/amso1100/c2_pd.c b/drivers/infiniband/hw/amso1100/c2_pd.c
index f3e81dc..995ecb2 100644
--- a/drivers/infiniband/hw/amso1100/c2_pd.c
+++ b/drivers/infiniband/hw/amso1100/c2_pd.c
@@ -33,7 +33,6 @@
* SOFTWARE.
*/
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/errno.h>
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 07eb3a8..70844f8 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -46,7 +46,6 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/tcp.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/if_arp.h>
#include <linux/vmalloc.h>
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index b7c9869..bc055c3 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -46,7 +46,6 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/tcp.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/mm.h>
#include <linux/inet.h>
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index 2f215b9..12072b4 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -39,7 +39,6 @@
#include <rdma/ib_pack.h>
#include <linux/mlx4/cmd.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <rdma/ib_user_verbs.h>
#include <linux/delay.h>
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 9c9f2f5..d885424 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -38,7 +38,6 @@
#include <linux/skbuff.h>
#include <linux/ip.h>
#include <linux/tcp.h>
-#include <linux/init.h>
#include <linux/if_arp.h>
#include <linux/if_vlan.h>
#include <linux/notifier.h>
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 2042c0f..1080762 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -43,7 +43,6 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/tcp.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 9fad7b5..6e7b53c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -32,7 +32,6 @@
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Thadeu Lima de Souza Cascardo <[email protected]>
Cc: Daniel Oliveira Nascimento <[email protected]>
Cc: Matthew Garrett <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/platform/goldfish/pdev_bus.c | 1 -
drivers/platform/x86/classmate-laptop.c | 1 -
drivers/platform/x86/hp_accel.c | 1 -
drivers/platform/x86/ideapad-laptop.c | 1 -
drivers/platform/x86/intel-rst.c | 1 -
drivers/platform/x86/intel-smartconnect.c | 1 -
drivers/platform/x86/intel_mid_powerbtn.c | 1 -
drivers/platform/x86/intel_mid_thermal.c | 1 -
drivers/platform/x86/panasonic-laptop.c | 1 -
drivers/platform/x86/pvpanic.c | 1 -
drivers/platform/x86/topstar-laptop.c | 1 -
drivers/platform/x86/toshiba_bluetooth.c | 1 -
drivers/platform/x86/xo15-ebook.c | 1 -
13 files changed, 13 deletions(-)
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index e4e999f..4f426b2 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/platform_device.h>
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 70d355a..790267b 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -17,7 +17,6 @@
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
index aff4d06..3fb7672 100644
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -23,7 +23,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/module.h>
#include <linux/types.h>
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 6dd060a..6242ac8 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/acpi.h>
#include <linux/rfkill.h>
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel-rst.c
index d45bca3..da64aee 100644
--- a/drivers/platform/x86/intel-rst.c
+++ b/drivers/platform/x86/intel-rst.c
@@ -17,7 +17,6 @@
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/acpi.h>
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c
index 04cf5df..01215fc 100644
--- a/drivers/platform/x86/intel-smartconnect.c
+++ b/drivers/platform/x86/intel-smartconnect.c
@@ -17,7 +17,6 @@
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/acpi.h>
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 8d67752..7d1f27f4 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 93fab8b..e7a79b1 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -25,7 +25,6 @@
#define pr_fmt(fmt) "intel_mid_thermal: " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/param.h>
#include <linux/device.h>
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 609d387..1c04871 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -118,7 +118,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/backlight.h>
#include <linux/ctype.h>
diff --git a/drivers/platform/x86/pvpanic.c b/drivers/platform/x86/pvpanic.c
index c9f6e51..b91aad2 100644
--- a/drivers/platform/x86/pvpanic.c
+++ b/drivers/platform/x86/pvpanic.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/acpi.h>
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index e597de0..d3b27e1 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/acpi.h>
#include <linux/input.h>
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 2cb1ea6..ff21318 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/acpi.h>
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
index 49cbcce..4d4bb4c 100644
--- a/drivers/platform/x86/xo15-ebook.c
+++ b/drivers/platform/x86/xo15-ebook.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/input.h>
#include <linux/acpi.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Bjorn Helgaas <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/pci/bus.c | 1 -
drivers/pci/host-bridge.c | 1 -
drivers/pci/hotplug/acpiphp_glue.c | 1 -
drivers/pci/hotplug/cpqphp_nvram.c | 1 -
drivers/pci/hotplug/s390_pci_hpc.c | 1 -
drivers/pci/msi.c | 1 -
drivers/pci/search.c | 1 -
drivers/pci/setup-irq.c | 1 -
drivers/pci/setup-res.c | 1 -
9 files changed, 9 deletions(-)
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 00660cc..ad0f20a 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -13,7 +13,6 @@
#include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/proc_fs.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include "pci.h"
diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index 06ace62..389e3df 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -3,7 +3,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/module.h>
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index cd929ae..1629963 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -41,7 +41,6 @@
#define pr_fmt(fmt) "acpiphp_glue: " fmt
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 76ba8a1..9600a39 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -34,7 +34,6 @@
#include <linux/workqueue.h>
#include <linux/pci.h>
#include <linux/pci_hotplug.h>
-#include <linux/init.h>
#include <asm/uaccess.h>
#include "cpqphp.h"
#include "cpqphp_nvram.h"
diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
index 8d2ce22..d1332d2 100644
--- a/drivers/pci/hotplug/s390_pci_hpc.c
+++ b/drivers/pci/hotplug/s390_pci_hpc.c
@@ -15,7 +15,6 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/pci_hotplug.h>
-#include <linux/init.h>
#include <asm/pci_debug.h>
#include <asm/sclp.h>
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 7a0fec6..18ca2497 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -10,7 +10,6 @@
#include <linux/mm.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/ioport.h>
#include <linux/pci.h>
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 3ff2ac7..cc6db38 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -7,7 +7,6 @@
* Copyright (C) 2003 -- 2004 Greg Kroah-Hartman <[email protected]>
*/
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/module.h>
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index 9bd6864..dbc4ffc 100644
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -10,7 +10,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/errno.h>
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 5c060b1..3e5682c 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -16,7 +16,6 @@
* Resource sorting
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/export.h>
#include <linux/pci.h>
--
1.8.4.1
Most were already deleted in the 1st pass audit; this instance
showed up more recently.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/sysdev/indirect_pci.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 1f6c570..66f5fd1 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -13,7 +13,6 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/string.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <asm/prom.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Arnd Bergmann <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/misc/ad525x_dpot.c | 1 -
drivers/misc/apds9802als.c | 1 -
drivers/misc/bmp085.c | 1 -
drivers/misc/carma/carma-fpga.c | 1 -
drivers/misc/ds1682.c | 1 -
drivers/misc/eeprom/at25.c | 1 -
drivers/misc/eeprom/eeprom.c | 1 -
drivers/misc/eeprom/eeprom_93xx46.c | 1 -
drivers/misc/eeprom/max6875.c | 1 -
drivers/misc/eeprom/sunxi_sid.c | 1 -
drivers/misc/genwqe/card_debugfs.c | 1 -
drivers/misc/hmc6352.c | 1 -
drivers/misc/isl29003.c | 1 -
drivers/misc/isl29020.c | 1 -
drivers/misc/lattice-ecp3-config.c | 1 -
drivers/misc/lis3lv02d/lis3lv02d.c | 1 -
drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 -
drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 -
drivers/misc/mei/amthif.c | 1 -
drivers/misc/mei/pci-me.c | 1 -
drivers/misc/ti-st/st_core.c | 1 -
drivers/misc/ti_dac7512.c | 1 -
drivers/misc/tsl2550.c | 1 -
23 files changed, 23 deletions(-)
diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c
index d3eee11..a43053d 100644
--- a/drivers/misc/ad525x_dpot.c
+++ b/drivers/misc/ad525x_dpot.c
@@ -72,7 +72,6 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
index 0c6e037..c6cc3dc 100644
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/err.h>
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index 820e53d..9b313f7 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -47,7 +47,6 @@
#include <linux/module.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/of.h>
#include "bmp085.h"
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 9e2b985..14d90ea 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -101,7 +101,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/poll.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/kref.h>
#include <linux/io.h>
diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c
index 154b02e..6a672f9 100644
--- a/drivers/misc/ds1682.c
+++ b/drivers/misc/ds1682.c
@@ -32,7 +32,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/string.h>
#include <linux/list.h>
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index 4f3bca1..634f729 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -10,7 +10,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index c169e07..545ca39 100644
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -17,7 +17,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index 78e55b5..9ebeacd 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -11,7 +11,6 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/slab.h>
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
index e36157d..580ff9d 100644
--- a/drivers/misc/eeprom/max6875.c
+++ b/drivers/misc/eeprom/max6875.c
@@ -27,7 +27,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
index 9c34e57..e703c71 100644
--- a/drivers/misc/eeprom/sunxi_sid.c
+++ b/drivers/misc/eeprom/sunxi_sid.c
@@ -21,7 +21,6 @@
#include <linux/err.h>
#include <linux/export.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/kobject.h>
diff --git a/drivers/misc/genwqe/card_debugfs.c b/drivers/misc/genwqe/card_debugfs.c
index 3bfdc07..50d2096 100644
--- a/drivers/misc/genwqe/card_debugfs.c
+++ b/drivers/misc/genwqe/card_debugfs.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
diff --git a/drivers/misc/hmc6352.c b/drivers/misc/hmc6352.c
index 170bd3d..90520d7 100644
--- a/drivers/misc/hmc6352.c
+++ b/drivers/misc/hmc6352.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/err.h>
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
index e3183f2..12c30b4 100644
--- a/drivers/misc/isl29003.c
+++ b/drivers/misc/isl29003.c
@@ -26,7 +26,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/mutex.h>
diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c
index b7f84da..4a9c50a 100644
--- a/drivers/misc/isl29020.c
+++ b/drivers/misc/isl29020.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/err.h>
diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c
index 61fbe6a..0a1565e 100644
--- a/drivers/misc/lattice-ecp3-config.c
+++ b/drivers/misc/lattice-ecp3-config.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/spi/spi.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
index 036effe..3ef4627 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -23,7 +23,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/module.h>
#include <linux/types.h>
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 7c97550..d324f8a 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/pm_runtime.h>
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 9aa2bd2..bd06d0c 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/input.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 2fad844..d9f14ef 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -21,7 +21,6 @@
#include <linux/fcntl.h>
#include <linux/aio.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/ioctl.h>
#include <linux/cdev.h>
#include <linux/list.h>
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index ddadd08..5434354 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -27,7 +27,6 @@
#include <linux/aio.h>
#include <linux/pci.h>
#include <linux/poll.h>
-#include <linux/init.h>
#include <linux/ioctl.h>
#include <linux/cdev.h>
#include <linux/sched.h>
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index 78a998b..e7fbc08 100644
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -22,7 +22,6 @@
#define pr_fmt(fmt) "(stc): " fmt
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/tty.h>
#include <linux/seq_file.h>
diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
index 83da711..cb0289b 100644
--- a/drivers/misc/ti_dac7512.c
+++ b/drivers/misc/ti_dac7512.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spi/spi.h>
#include <linux/of.h>
diff --git a/drivers/misc/tsl2550.c b/drivers/misc/tsl2550.c
index 5bc10fa1..b003356 100644
--- a/drivers/misc/tsl2550.c
+++ b/drivers/misc/tsl2550.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/mutex.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Linus Walleij <[email protected]>
Cc: Alexandre Courbot <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/gpio/gpio-74x164.c | 1 -
drivers/gpio/gpio-adp5520.c | 1 -
drivers/gpio/gpio-adp5588.c | 1 -
drivers/gpio/gpio-generic.c | 1 -
drivers/gpio/gpio-grgpio.c | 1 -
drivers/gpio/gpio-janz-ttl.c | 1 -
drivers/gpio/gpio-kempld.c | 1 -
drivers/gpio/gpio-lpc32xx.c | 1 -
drivers/gpio/gpio-max730x.c | 1 -
drivers/gpio/gpio-moxart.c | 1 -
drivers/gpio/gpio-msm-v2.c | 1 -
drivers/gpio/gpio-rcar.c | 1 -
drivers/gpio/gpio-rdc321x.c | 1 -
drivers/gpio/gpio-sch.c | 1 -
drivers/gpio/gpio-sodaville.c | 1 -
drivers/gpio/gpio-twl6040.c | 1 -
drivers/gpio/gpio-vr41xx.c | 1 -
17 files changed, 17 deletions(-)
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index e4ae298..8aa8a97 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/spi/spi.h>
#include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 6132659..00f54fa 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -9,7 +9,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mfd/adp5520.h>
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 3f190e6..a5b7a20 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/interrupt.h>
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index d2196bf..cdc8437 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -44,7 +44,6 @@ o ` ~~~~\___/~~~~ ` controller in FPGA is ,.`
* `.......````.```
*/
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/bug.h>
#include <linux/kernel.h>
diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 84d2478..d137fd3 100644
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/of.h>
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 2ecd3a0..ab0bfb9 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index c6d8817..8a2ff81 100644
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 225344d..f2f9353 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -17,7 +17,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/errno.h>
#include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index 8672755..f8c01a4 100644
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -31,7 +31,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/spi/max7301.h>
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index 2af9900..799da97 100644
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -11,7 +11,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index a3351ac..f817e59 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -21,7 +21,6 @@
#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irqchip/chained_irq.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index ca76ce7..32963f2 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -15,7 +15,6 @@
#include <linux/err.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/ioport.h>
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 88577c3..45e1fc7 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/platform_device.h>
#include <linux/pci.h>
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 5af6571..4dd3ded 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -18,7 +18,6 @@
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index 7c6c518..8bd814f 100644
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -11,7 +11,6 @@
#include <linux/errno.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 0caf5cd..9377fc0 100644
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kthread.h>
#include <linux/irq.h>
#include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index 9902732..b983bc0 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -22,7 +22,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Chris Ball <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/mmc/host/android-goldfish.c | 1 -
drivers/mmc/host/bfin_sdh.c | 1 -
drivers/mmc/host/mmci.c | 1 -
drivers/mmc/host/msm_sdcc.c | 1 -
drivers/mmc/host/mxcmmc.c | 1 -
drivers/mmc/host/mxs-mmc.c | 1 -
drivers/mmc/host/omap.c | 1 -
drivers/mmc/host/omap_hsmmc.c | 1 -
drivers/mmc/host/pxamci.c | 1 -
drivers/mmc/host/sdhci-acpi.c | 1 -
drivers/mmc/host/sdhci-pxav2.c | 1 -
drivers/mmc/host/sdhci-pxav3.c | 1 -
drivers/mmc/host/sdhci-tegra.c | 1 -
drivers/mmc/host/wmt-sdmmc.c | 1 -
14 files changed, 14 deletions(-)
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index 8b4e20a..54fc950 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -35,7 +35,6 @@
#include <linux/mmc/card.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 2b7f37e..e5efbbf 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -9,7 +9,6 @@
#define DRIVER_NAME "bfin-sdh"
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index b931226..ebb64cd 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -10,7 +10,6 @@
*/
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/device.h>
#include <linux/interrupt.h>
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 9405ecd..15933dc 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/device.h>
#include <linux/interrupt.h>
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index f7199c8..b573b50 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 073e871..19633fe 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -21,7 +21,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 98b6b6e..41f536f 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index dbd32ad..2a629fb 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/debugfs.h>
#include <linux/dmaengine.h>
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 32fe113..9427d67 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -17,7 +17,6 @@
* max block length up to 1023
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 9ce17f6..4d68e1a 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -18,7 +18,6 @@
*
*/
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/module.h>
#include <linux/device.h>
diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index d51e061..b75a975 100644
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -18,7 +18,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/module.h>
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 793dacd..783c991 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -17,7 +17,6 @@
*
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/io.h>
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index a835898..ec7ebbc 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -14,7 +14,6 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/io.h>
diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
index e902ed7..12a47ea 100644
--- a/drivers/mmc/host/wmt-sdmmc.c
+++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/ioport.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/pcmcia/bfin_cf_pcmcia.c | 1 -
drivers/pcmcia/electra_cf.c | 1 -
drivers/pcmcia/i82092.c | 1 -
drivers/pcmcia/pd6729.c | 1 -
drivers/pcmcia/pxa2xx_viper.c | 1 -
drivers/pcmcia/sa1100_assabet.c | 1 -
drivers/pcmcia/sa1100_cerf.c | 1 -
drivers/pcmcia/sa1100_h3600.c | 1 -
drivers/pcmcia/sa1100_nanoengine.c | 1 -
drivers/pcmcia/sa1100_shannon.c | 1 -
drivers/pcmcia/sa1100_simpad.c | 1 -
drivers/pcmcia/sa1111_jornada720.c | 1 -
drivers/pcmcia/sa1111_lubbock.c | 1 -
drivers/pcmcia/sa1111_neponset.c | 1 -
drivers/pcmcia/soc_common.c | 1 -
drivers/pcmcia/socket_sysfs.c | 1 -
drivers/pcmcia/vrc4171_card.c | 1 -
drivers/pcmcia/vrc4173_cardu.c | 1 -
18 files changed, 18 deletions(-)
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index 971991b..38fba4b 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -30,7 +30,6 @@
#include <linux/sched.h>
#include <linux/platform_device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 5ea64d0..aff5af2 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -25,7 +25,6 @@
#include <linux/sched.h>
#include <linux/platform_device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/mm.h>
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 7d47456..032e115 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/device.h>
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 622dd6f..14ec899 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/device.h>
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index a76f495..dc10637 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index 44cfc44..2ba4b9f 100644
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -9,7 +9,6 @@
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/gpio.h>
#include <asm/mach-types.h>
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index b3774e5..ed65bbf 100644
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -8,7 +8,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/gpio.h>
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index 431d8b0..9cde70c 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -8,7 +8,6 @@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/gpio.h>
diff --git a/drivers/pcmcia/sa1100_nanoengine.c b/drivers/pcmcia/sa1100_nanoengine.c
index 35c30ff..bf3fe92 100644
--- a/drivers/pcmcia/sa1100_nanoengine.c
+++ b/drivers/pcmcia/sa1100_nanoengine.c
@@ -22,7 +22,6 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/signal.h>
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index b07a2dc..eee7c00 100644
--- a/drivers/pcmcia/sa1100_shannon.c
+++ b/drivers/pcmcia/sa1100_shannon.c
@@ -7,7 +7,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <mach/hardware.h>
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 73fd379..f73e9d2 100644
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -7,7 +7,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c
index 3baa3ef..e0fd2c2 100644
--- a/drivers/pcmcia/sa1111_jornada720.c
+++ b/drivers/pcmcia/sa1111_jornada720.c
@@ -8,7 +8,6 @@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <mach/hardware.h>
#include <asm/hardware/sa1111.h>
diff --git a/drivers/pcmcia/sa1111_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c
index c5caf57..a19fb91 100644
--- a/drivers/pcmcia/sa1111_lubbock.c
+++ b/drivers/pcmcia/sa1111_lubbock.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <mach/hardware.h>
diff --git a/drivers/pcmcia/sa1111_neponset.c b/drivers/pcmcia/sa1111_neponset.c
index 1d78739..d0bc44f 100644
--- a/drivers/pcmcia/sa1111_neponset.c
+++ b/drivers/pcmcia/sa1111_neponset.c
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index a2bc6ee..3c25d2e 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -33,7 +33,6 @@
#include <linux/cpufreq.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index d688151..4132815 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/major.h>
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index d98a086..2f48f1b 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -17,7 +17,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index d926920..a35a4f4 100644
--- a/drivers/pcmcia/vrc4173_cardu.c
+++ b/drivers/pcmcia/vrc4173_cardu.c
@@ -28,7 +28,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Herbert Xu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/crypto/atmel-aes.c | 1 -
drivers/crypto/atmel-sha.c | 1 -
drivers/crypto/atmel-tdes.c | 1 -
drivers/crypto/nx/nx_debugfs.c | 1 -
drivers/crypto/omap-aes.c | 1 -
drivers/crypto/omap-sham.c | 1 -
drivers/crypto/picoxcell_crypto.c | 1 -
drivers/crypto/s5p-sss.c | 1 -
drivers/crypto/tegra-aes.c | 1 -
9 files changed, 9 deletions(-)
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index d7c9e31..70fb6fb 100644
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -24,7 +24,6 @@
#include <linux/platform_device.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 0618be0..637141b 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -24,7 +24,6 @@
#include <linux/platform_device.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 6cde5b5..604a67f 100644
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -24,7 +24,6 @@
#include <linux/platform_device.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/drivers/crypto/nx/nx_debugfs.c b/drivers/crypto/nx/nx_debugfs.c
index 7ab2e8d..899d857 100644
--- a/drivers/crypto/nx/nx_debugfs.c
+++ b/drivers/crypto/nx/nx_debugfs.c
@@ -24,7 +24,6 @@
#include <linux/string.h>
#include <linux/debugfs.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/crypto.h>
#include <crypto/hash.h>
#include <asm/vio.h>
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index dde41f1d..6d34dac 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -19,7 +19,6 @@
#include <linux/err.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index a727a6a..5d303eb 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -19,7 +19,6 @@
#include <linux/err.h>
#include <linux/device.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index a6175ba..e50a1b9 100644
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -29,7 +29,6 @@
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/list.h>
diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index cf149b1..78b7eed 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -14,7 +14,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/clk.h>
diff --git a/drivers/crypto/tegra-aes.c b/drivers/crypto/tegra-aes.c
index 060eecc..4c0548f 100644
--- a/drivers/crypto/tegra-aes.c
+++ b/drivers/crypto/tegra-aes.c
@@ -30,7 +30,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/clk.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: David Woodhouse <[email protected]>
Cc: Brian Norris <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/mtd/chips/cfi_cmdset_0001.c | 1 -
drivers/mtd/chips/cfi_cmdset_0002.c | 1 -
drivers/mtd/chips/cfi_cmdset_0020.c | 1 -
drivers/mtd/devices/m25p80.c | 1 -
drivers/mtd/devices/mtd_dataflash.c | 1 -
drivers/mtd/devices/sst25l.c | 1 -
drivers/mtd/inftlmount.c | 1 -
drivers/mtd/maps/bfin-async-flash.c | 1 -
drivers/mtd/maps/gpio-addr-flash.c | 1 -
drivers/mtd/maps/intel_vr_nor.c | 1 -
drivers/mtd/maps/ixp4xx.c | 1 -
drivers/mtd/maps/lantiq-flash.c | 1 -
drivers/mtd/maps/latch-addr-flash.c | 1 -
drivers/mtd/maps/pci.c | 1 -
drivers/mtd/maps/physmap_of.c | 1 -
drivers/mtd/maps/plat-ram.c | 1 -
drivers/mtd/maps/pxa2xx-flash.c | 1 -
drivers/mtd/maps/rbtx4939-flash.c | 1 -
drivers/mtd/maps/sa1100-flash.c | 1 -
drivers/mtd/maps/scb2_flash.c | 1 -
drivers/mtd/maps/sun_uflash.c | 1 -
drivers/mtd/mtd_blkdevs.c | 1 -
drivers/mtd/nand/ams-delta.c | 1 -
drivers/mtd/nand/au1550nd.c | 1 -
drivers/mtd/nand/bf5xx_nand.c | 1 -
drivers/mtd/nand/davinci_nand.c | 1 -
drivers/mtd/nand/fsl_elbc_nand.c | 1 -
drivers/mtd/nand/fsl_ifc_nand.c | 1 -
drivers/mtd/nand/gpio.c | 1 -
drivers/mtd/nand/mpc5121_nfc.c | 1 -
drivers/mtd/nand/nuc900_nand.c | 1 -
drivers/mtd/nand/pasemi_nand.c | 1 -
drivers/mtd/nand/s3c2410.c | 1 -
drivers/mtd/onenand/generic.c | 1 -
drivers/mtd/onenand/omap2.c | 1 -
drivers/mtd/onenand/onenand_base.c | 1 -
drivers/mtd/tests/mtd_test.c | 1 -
drivers/mtd/ubi/ubi.h | 1 -
38 files changed, 38 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 7751443..a19719e 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -21,7 +21,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <asm/byteorder.h>
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 89b9d68..718244d 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -24,7 +24,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <asm/byteorder.h>
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 096993f..8852942 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -22,7 +22,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <asm/byteorder.h>
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index d0f6475..4978f00 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -15,7 +15,6 @@
*
*/
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/module.h>
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 624069d..8b278d2 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -10,7 +10,6 @@
* 2 of the License, or (at your option) any later version.
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 687bf27..c63ecbc 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -15,7 +15,6 @@
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/mutex.h>
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 4adc037..487e64f 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -30,7 +30,6 @@
#include <asm/uaccess.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nftl.h>
#include <linux/mtd/inftl.h>
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 5434d8d..6ea51e5 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -14,7 +14,6 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 1adba86..a4c477b 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -14,7 +14,6 @@
*/
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c
index 46d195f..5ab71f0 100644
--- a/drivers/mtd/maps/intel_vr_nor.c
+++ b/drivers/mtd/maps/intel_vr_nor.c
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index d6b2451..6a589f1 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -16,7 +16,6 @@
#include <linux/err.h>
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 93c507a..7aa682c 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index 98bb5d5..cadfbe0 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -10,7 +10,6 @@
* kind, whether express or implied.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 36da518..eb0242e 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index d111097..217c25d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 10196f5..76ace85 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/ioport.h>
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 9aad854..cb4d92e 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -13,7 +13,6 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index 9352512..146b604 100644
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/device.h>
#include <linux/platform_device.h>
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 8fc06bf..3428034e 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -7,7 +7,6 @@
#include <linux/types.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 3051c4c..b7a22a6 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -47,7 +47,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 39cc418..b6f1aac 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 5073cbc..0b2ccb6 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -30,7 +30,6 @@
#include <linux/blkpg.h>
#include <linux/spinlock.h>
#include <linux/hdreg.h>
-#include <linux/init.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 8611eb4..4936e9e 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -17,7 +17,6 @@
*/
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 2880d88..7d84c4e 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 94f55db..b7a2494 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -37,7 +37,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/ioport.h>
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index a4989ec..4f5f322 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -24,7 +24,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/err.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index bcf6080..ec549cd 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/ioport.h>
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 90ca7e7..f8c77e3 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/of_address.h>
#include <linux/slab.h>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 8e6148a..117ce33 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 31ee7cf..e78841a 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -30,7 +30,6 @@
#include <linux/gfp.h>
#include <linux/delay.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 9ee09a8..90c99ea 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -10,7 +10,6 @@
*/
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/io.h>
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 90f871a..2c98f9d 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -23,7 +23,6 @@
#undef DEBUG
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 47fbd9a..62a8958 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -29,7 +29,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/io.h>
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 8e1919b..093c29a 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -13,7 +13,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 6547c84..d945473 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -25,7 +25,6 @@
#include <linux/device.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/onenand.h>
#include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 1de33b5..531ccbc 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/mtd/tests/mtd_test.c b/drivers/mtd/tests/mtd_test.c
index c818a63..111ee46 100644
--- a/drivers/mtd/tests/mtd_test.c
+++ b/drivers/mtd/tests/mtd_test.c
@@ -1,6 +1,5 @@
#define pr_fmt(fmt) "mtd_test: " fmt
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/printk.h>
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 8ea6297..4176322 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -22,7 +22,6 @@
#ifndef __UBI_UBI_H__
#define __UBI_UBI_H__
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/list.h>
#include <linux/rbtree.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Ralf Baechle <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/mips/alchemy/common/power.c | 1 -
arch/mips/ath79/common.h | 1 -
arch/mips/bcm47xx/nvram.c | 1 -
arch/mips/bcm63xx/early_printk.c | 1 -
arch/mips/boot/compressed/dbg.c | 1 -
arch/mips/boot/compressed/uart-16550.c | 1 -
arch/mips/cavium-octeon/smp.c | 1 -
arch/mips/fw/arc/file.c | 1 -
arch/mips/include/asm/highmem.h | 1 -
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 -
arch/mips/include/asm/mach-generic/floppy.h | 1 -
arch/mips/include/asm/mach-jazz/floppy.h | 1 -
arch/mips/jz4740/platform.c | 1 -
arch/mips/kernel/bmips_vec.S | 1 -
arch/mips/kernel/crash.c | 1 -
arch/mips/kernel/spram.c | 1 -
arch/mips/kernel/sync-r4k.c | 1 -
arch/mips/kvm/kvm_tlb.c | 1 -
arch/mips/lantiq/xway/clk.c | 1 -
arch/mips/lasat/at93c.c | 1 -
arch/mips/lasat/picvue.c | 1 -
arch/mips/lib/uncached.c | 1 -
arch/mips/loongson/lemote-2f/clock.c | 1 -
arch/mips/mm/c-octeon.c | 1 -
arch/mips/mm/c-r3k.c | 1 -
arch/mips/mm/cache.c | 1 -
arch/mips/mm/cex-sb1.S | 1 -
arch/mips/mm/hugetlbpage.c | 1 -
arch/mips/mm/page.c | 1 -
arch/mips/mm/sc-rm7k.c | 1 -
arch/mips/mm/tlb-r3k.c | 1 -
arch/mips/mm/tlb-r8k.c | 1 -
arch/mips/mm/tlbex.c | 1 -
arch/mips/mm/uasm-micromips.c | 1 -
arch/mips/mm/uasm-mips.c | 1 -
arch/mips/mti-malta/malta-amon.c | 1 -
arch/mips/mti-sead3/sead3-pic32-bus.c | 1 -
arch/mips/netlogic/common/reset.S | 1 -
arch/mips/netlogic/common/smpboot.S | 1 -
arch/mips/netlogic/xlp/wakeup.c | 1 -
arch/mips/netlogic/xlr/wakeup.c | 1 -
arch/mips/pci/fixup-rc32434.c | 1 -
arch/mips/pci/fixup-sb1250.c | 1 -
arch/mips/pci/ops-bcm63xx.c | 1 -
arch/mips/pci/ops-bonito64.c | 1 -
arch/mips/pci/ops-lantiq.c | 1 -
arch/mips/pci/ops-loongson2.c | 1 -
arch/mips/pci/ops-mace.c | 1 -
arch/mips/pci/ops-msc.c | 1 -
arch/mips/pci/ops-nile4.c | 1 -
arch/mips/pci/ops-rc32434.c | 1 -
arch/mips/pci/pci-ip27.c | 1 -
arch/mips/sgi-ip27/ip27-console.c | 1 -
arch/mips/sgi-ip27/ip27-irq-pci.c | 1 -
arch/mips/sgi-ip27/ip27-klconfig.c | 1 -
arch/mips/sgi-ip27/ip27-xtalk.c | 1 -
56 files changed, 56 deletions(-)
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c
index 0c7fce2..bdb28dee 100644
--- a/arch/mips/alchemy/common/power.c
+++ b/arch/mips/alchemy/common/power.c
@@ -29,7 +29,6 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/pm.h>
#include <linux/sysctl.h>
#include <linux/jiffies.h>
diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
index 648d2da..a312071 100644
--- a/arch/mips/ath79/common.h
+++ b/arch/mips/ath79/common.h
@@ -15,7 +15,6 @@
#define __ATH79_COMMON_H
#include <linux/types.h>
-#include <linux/init.h>
#define ATH79_MEM_SIZE_MIN (2 * 1024 * 1024)
#define ATH79_MEM_SIZE_MAX (128 * 1024 * 1024)
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index 085a3ee..6decb27 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -11,7 +11,6 @@
* option) any later version.
*/
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/ssb/ssb.h>
diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c
index f92f1a2..6092226 100644
--- a/arch/mips/bcm63xx/early_printk.c
+++ b/arch/mips/bcm63xx/early_printk.c
@@ -6,7 +6,6 @@
* Copyright (C) 2008 Maxime Bizon <[email protected]>
*/
-#include <linux/init.h>
#include <bcm63xx_io.h>
#include <linux/serial_bcm63xx.h>
diff --git a/arch/mips/boot/compressed/dbg.c b/arch/mips/boot/compressed/dbg.c
index 134a616..06c6a5b 100644
--- a/arch/mips/boot/compressed/dbg.c
+++ b/arch/mips/boot/compressed/dbg.c
@@ -6,7 +6,6 @@
* need to implement your own putc().
*/
#include <linux/compiler.h>
-#include <linux/init.h>
#include <linux/types.h>
void __weak putc(char c)
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c
index 869172d..237494b 100644
--- a/arch/mips/boot/compressed/uart-16550.c
+++ b/arch/mips/boot/compressed/uart-16550.c
@@ -4,7 +4,6 @@
#include <linux/types.h>
#include <linux/serial_reg.h>
-#include <linux/init.h>
#include <asm/addrspace.h>
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 24a2167..67a078f 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -6,7 +6,6 @@
* Copyright (C) 2004-2008, 2009, 2010 Cavium Networks
*/
#include <linux/cpu.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/smp.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/fw/arc/file.c b/arch/mips/fw/arc/file.c
index a8b0803..49fd3ff 100644
--- a/arch/mips/fw/arc/file.c
+++ b/arch/mips/fw/arc/file.c
@@ -8,7 +8,6 @@
* Copyright (C) 1994, 1995, 1996, 1999 Ralf Baechle
* Copyright (C) 1999 Silicon Graphics, Inc.
*/
-#include <linux/init.h>
#include <asm/fw/arc/types.h>
#include <asm/sgialib.h>
diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h
index b0dd0c8..572e63e 100644
--- a/arch/mips/include/asm/highmem.h
+++ b/arch/mips/include/asm/highmem.h
@@ -19,7 +19,6 @@
#ifdef __KERNEL__
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/uaccess.h>
#include <asm/kmap_types.h>
diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
index b86a125..cd41e93 100644
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -16,7 +16,6 @@
#define __ASM_MACH_AR71XX_REGS_H
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/bitops.h>
diff --git a/arch/mips/include/asm/mach-generic/floppy.h b/arch/mips/include/asm/mach-generic/floppy.h
index 5b5cd68..e2561d9 100644
--- a/arch/mips/include/asm/mach-generic/floppy.h
+++ b/arch/mips/include/asm/mach-generic/floppy.h
@@ -9,7 +9,6 @@
#define __ASM_MACH_GENERIC_FLOPPY_H
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/sched.h>
#include <linux/linkage.h>
diff --git a/arch/mips/include/asm/mach-jazz/floppy.h b/arch/mips/include/asm/mach-jazz/floppy.h
index 62aa1e2..4b86c88 100644
--- a/arch/mips/include/asm/mach-jazz/floppy.h
+++ b/arch/mips/include/asm/mach-jazz/floppy.h
@@ -9,7 +9,6 @@
#define __ASM_MACH_JAZZ_FLOPPY_H
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/types.h>
#include <linux/mm.h>
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index 1be41e2..a447101 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -14,7 +14,6 @@
*/
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/resource.h>
diff --git a/arch/mips/kernel/bmips_vec.S b/arch/mips/kernel/bmips_vec.S
index 122aa7f..a5bf73d 100644
--- a/arch/mips/kernel/bmips_vec.S
+++ b/arch/mips/kernel/bmips_vec.S
@@ -8,7 +8,6 @@
* Reset/NMI/re-entry vectors for BMIPS processors
*/
-#include <linux/init.h>
#include <asm/asm.h>
#include <asm/asmmacro.h>
diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c
index 93aa302..d212646 100644
--- a/arch/mips/kernel/crash.c
+++ b/arch/mips/kernel/crash.c
@@ -5,7 +5,6 @@
#include <linux/bootmem.h>
#include <linux/crash_dump.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/types.h>
#include <linux/sched.h>
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c
index dfed8a4..b242e2c 100644
--- a/arch/mips/kernel/spram.c
+++ b/arch/mips/kernel/spram.c
@@ -8,7 +8,6 @@
*
* Copyright (C) 2007, 2008 MIPS Technologies, Inc.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>
#include <linux/stddef.h>
diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
index 84536bf..c24ad5f 100644
--- a/arch/mips/kernel/sync-r4k.c
+++ b/arch/mips/kernel/sync-r4k.c
@@ -11,7 +11,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/irqflags.h>
#include <linux/cpumask.h>
diff --git a/arch/mips/kvm/kvm_tlb.c b/arch/mips/kvm/kvm_tlb.c
index c777dd3..26db6ba 100644
--- a/arch/mips/kvm/kvm_tlb.c
+++ b/arch/mips/kvm/kvm_tlb.c
@@ -10,7 +10,6 @@
* Authors: Sanjay Lal <[email protected]>
*/
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/mm.h>
diff --git a/arch/mips/lantiq/xway/clk.c b/arch/mips/lantiq/xway/clk.c
index 1ab576d..8750dc0 100644
--- a/arch/mips/lantiq/xway/clk.c
+++ b/arch/mips/lantiq/xway/clk.c
@@ -8,7 +8,6 @@
#include <linux/io.h>
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <asm/time.h>
diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c
index 793e234..942f32b 100644
--- a/arch/mips/lasat/at93c.c
+++ b/arch/mips/lasat/at93c.c
@@ -8,7 +8,6 @@
#include <linux/delay.h>
#include <asm/lasat/lasat.h>
#include <linux/module.h>
-#include <linux/init.h>
#include "at93c.h"
diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c
index 7eb3348..d613b97 100644
--- a/arch/mips/lasat/picvue.c
+++ b/arch/mips/lasat/picvue.c
@@ -9,7 +9,6 @@
#include <asm/bootinfo.h>
#include <asm/lasat/lasat.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/string.h>
diff --git a/arch/mips/lib/uncached.c b/arch/mips/lib/uncached.c
index d8522f8..09d5dee 100644
--- a/arch/mips/lib/uncached.c
+++ b/arch/mips/lib/uncached.c
@@ -8,7 +8,6 @@
* Author: Maciej W. Rozycki <[email protected]>
*/
-#include <linux/init.h>
#include <asm/addrspace.h>
#include <asm/bug.h>
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 4dc2f5f..aed32b8 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -10,7 +10,6 @@
#include <linux/cpufreq.h>
#include <linux/errno.h>
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/spinlock.h>
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c
index c8efdb5..f41a5c5 100644
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
@@ -6,7 +6,6 @@
* Copyright (C) 2005-2007 Cavium Networks
*/
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index 2fcde0c..135ec31 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -9,7 +9,6 @@
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
* Copyright (C) 2001, 2004, 2007 Maciej W. Rozycki
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 15f813c..fde7e56 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -8,7 +8,6 @@
*/
#include <linux/fs.h>
#include <linux/fcntl.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/linkage.h>
#include <linux/module.h>
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S
index 191cf6e..5d5f296 100644
--- a/arch/mips/mm/cex-sb1.S
+++ b/arch/mips/mm/cex-sb1.S
@@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <linux/init.h>
#include <asm/asm.h>
#include <asm/regdef.h>
diff --git a/arch/mips/mm/hugetlbpage.c b/arch/mips/mm/hugetlbpage.c
index 01fda44..77e0ae0 100644
--- a/arch/mips/mm/hugetlbpage.c
+++ b/arch/mips/mm/hugetlbpage.c
@@ -11,7 +11,6 @@
* Copyright (C) 2008, 2009 Cavium Networks, Inc.
*/
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/hugetlb.h>
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
index cbd81d1..58033c4 100644
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
@@ -8,7 +8,6 @@
* Copyright (C) 2008 Thiemo Seufer
* Copyright (C) 2012 MIPS Technologies, Inc.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
diff --git a/arch/mips/mm/sc-rm7k.c b/arch/mips/mm/sc-rm7k.c
index aaffbba..9ac1efc 100644
--- a/arch/mips/mm/sc-rm7k.c
+++ b/arch/mips/mm/sc-rm7k.c
@@ -6,7 +6,6 @@
#undef DEBUG
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/bitops.h>
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
index 9aca109..d657493 100644
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@ -10,7 +10,6 @@
* Copyright (C) 2002 Ralf Baechle
* Copyright (C) 2002 Maciej W. Rozycki
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
index 6a99733..138a2ec 100644
--- a/arch/mips/mm/tlb-r8k.c
+++ b/arch/mips/mm/tlb-r8k.c
@@ -8,7 +8,6 @@
* Carsten Langgaard, [email protected]
* Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.
*/
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/mm.h>
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 6fdfe1f..b234b1b 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -26,7 +26,6 @@
#include <linux/types.h>
#include <linux/smp.h>
#include <linux/string.h>
-#include <linux/init.h>
#include <linux/cache.h>
#include <asm/cacheflush.h>
diff --git a/arch/mips/mm/uasm-micromips.c b/arch/mips/mm/uasm-micromips.c
index 060000f..b8d580c 100644
--- a/arch/mips/mm/uasm-micromips.c
+++ b/arch/mips/mm/uasm-micromips.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <asm/inst.h>
#include <asm/elf.h>
diff --git a/arch/mips/mm/uasm-mips.c b/arch/mips/mm/uasm-mips.c
index 0c72458..3abd609 100644
--- a/arch/mips/mm/uasm-mips.c
+++ b/arch/mips/mm/uasm-mips.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <asm/inst.h>
#include <asm/elf.h>
diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c
index 0319ad8..592ac04 100644
--- a/arch/mips/mti-malta/malta-amon.c
+++ b/arch/mips/mti-malta/malta-amon.c
@@ -9,7 +9,6 @@
* Arbitrary Monitor Interface
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/addrspace.h>
diff --git a/arch/mips/mti-sead3/sead3-pic32-bus.c b/arch/mips/mti-sead3/sead3-pic32-bus.c
index eb2bf93..3b12aa5 100644
--- a/arch/mips/mti-sead3/sead3-pic32-bus.c
+++ b/arch/mips/mti-sead3/sead3-pic32-bus.c
@@ -8,7 +8,6 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/errno.h>
diff --git a/arch/mips/netlogic/common/reset.S b/arch/mips/netlogic/common/reset.S
index dfbf94d..b231fe1 100644
--- a/arch/mips/netlogic/common/reset.S
+++ b/arch/mips/netlogic/common/reset.S
@@ -32,7 +32,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/init.h>
#include <asm/asm.h>
#include <asm/asm-offsets.h>
diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S
index db3b894..8597657 100644
--- a/arch/mips/netlogic/common/smpboot.S
+++ b/arch/mips/netlogic/common/smpboot.S
@@ -32,7 +32,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/init.h>
#include <asm/asm.h>
#include <asm/asm-offsets.h>
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index 4eb7cdb..9a92617 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -32,7 +32,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/threads.h>
diff --git a/arch/mips/netlogic/xlr/wakeup.c b/arch/mips/netlogic/xlr/wakeup.c
index ec60e71..d61cba1 100644
--- a/arch/mips/netlogic/xlr/wakeup.c
+++ b/arch/mips/netlogic/xlr/wakeup.c
@@ -32,7 +32,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/threads.h>
diff --git a/arch/mips/pci/fixup-rc32434.c b/arch/mips/pci/fixup-rc32434.c
index d0f6ecb..7fcafd5 100644
--- a/arch/mips/pci/fixup-rc32434.c
+++ b/arch/mips/pci/fixup-rc32434.c
@@ -27,7 +27,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/mach-rc32434/rc32434.h>
#include <asm/mach-rc32434/irq.h>
diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c
index 1441bec..8feae91 100644
--- a/arch/mips/pci/fixup-sb1250.c
+++ b/arch/mips/pci/fixup-sb1250.c
@@ -8,7 +8,6 @@
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/init.h>
#include <linux/pci.h>
/*
diff --git a/arch/mips/pci/ops-bcm63xx.c b/arch/mips/pci/ops-bcm63xx.c
index 6144bb3..13eea69 100644
--- a/arch/mips/pci/ops-bcm63xx.c
+++ b/arch/mips/pci/ops-bcm63xx.c
@@ -9,7 +9,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/arch/mips/pci/ops-bonito64.c b/arch/mips/pci/ops-bonito64.c
index 830352e..c06205a 100644
--- a/arch/mips/pci/ops-bonito64.c
+++ b/arch/mips/pci/ops-bonito64.c
@@ -22,7 +22,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/mips-boards/bonito64.h>
diff --git a/arch/mips/pci/ops-lantiq.c b/arch/mips/pci/ops-lantiq.c
index 16e7c25..e5738ee 100644
--- a/arch/mips/pci/ops-lantiq.c
+++ b/arch/mips/pci/ops-lantiq.c
@@ -9,7 +9,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/mm.h>
#include <asm/addrspace.h>
diff --git a/arch/mips/pci/ops-loongson2.c b/arch/mips/pci/ops-loongson2.c
index 98254af..24138bb 100644
--- a/arch/mips/pci/ops-loongson2.c
+++ b/arch/mips/pci/ops-loongson2.c
@@ -14,7 +14,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/export.h>
#include <loongson.h>
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 1cfb558..6b5821f 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -6,7 +6,6 @@
* Copyright (C) 2000, 2001 Keith M Wesolowski
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <asm/pci.h>
diff --git a/arch/mips/pci/ops-msc.c b/arch/mips/pci/ops-msc.c
index 92a8543..dbbf365 100644
--- a/arch/mips/pci/ops-msc.c
+++ b/arch/mips/pci/ops-msc.c
@@ -24,7 +24,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/mips-boards/msc01_pci.h>
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c
index 499e35c..a1a7c9f 100644
--- a/arch/mips/pci/ops-nile4.c
+++ b/arch/mips/pci/ops-nile4.c
@@ -1,5 +1,4 @@
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c
index 7c7182e..874ed6d 100644
--- a/arch/mips/pci/ops-rc32434.c
+++ b/arch/mips/pci/ops-rc32434.c
@@ -26,7 +26,6 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/pci.h>
#include <linux/types.h>
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index 162b4cb..0f09eaf 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -7,7 +7,6 @@
* Copyright (C) 1999, 2000, 04 Ralf Baechle ([email protected])
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/export.h>
#include <linux/pci.h>
diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index b952d5b..45fdfbc 100644
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -5,7 +5,6 @@
*
* Copyright (C) 2001, 2002 Ralf Baechle
*/
-#include <linux/init.h>
#include <asm/page.h>
#include <asm/sn/addrs.h>
diff --git a/arch/mips/sgi-ip27/ip27-irq-pci.c b/arch/mips/sgi-ip27/ip27-irq-pci.c
index ec22ec5..2a1c407 100644
--- a/arch/mips/sgi-ip27/ip27-irq-pci.c
+++ b/arch/mips/sgi-ip27/ip27-irq-pci.c
@@ -8,7 +8,6 @@
#undef DEBUG
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/errno.h>
#include <linux/signal.h>
diff --git a/arch/mips/sgi-ip27/ip27-klconfig.c b/arch/mips/sgi-ip27/ip27-klconfig.c
index 7afe146..c873d62 100644
--- a/arch/mips/sgi-ip27/ip27-klconfig.c
+++ b/arch/mips/sgi-ip27/ip27-klconfig.c
@@ -2,7 +2,6 @@
* Copyright (C) 1999, 2000 Ralf Baechle ([email protected])
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c
index d59b820..20f582a 100644
--- a/arch/mips/sgi-ip27/ip27-xtalk.c
+++ b/arch/mips/sgi-ip27/ip27-xtalk.c
@@ -7,7 +7,6 @@
* Generic XTALK initialization code
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <asm/sn/types.h>
--
1.8.4.1
On Tue, Jan 21, 2014 at 04:23:10PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
Acked-by: Mark Brown <[email protected]>
We currently get __init_or_module from init.h (implicitly) but if
we move that to module.h we will get failures like this:
In file included from /home/paul/git/linux-head/arch/arm/include/asm/gpio.h:10:0,
from include/linux/gpio.h:48,
from include/linux/of_gpio.h:20,
from drivers/input/touchscreen/ads7846.c:30:
arch/arm/mach-at91/include/mach/gpio.h:191:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_GPIO_periph'
arch/arm/mach-at91/include/mach/gpio.h:192:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_A_periph'
arch/arm/mach-at91/include/mach/gpio.h:193:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_B_periph'
arch/arm/mach-at91/include/mach/gpio.h:194:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_C_periph'
arch/arm/mach-at91/include/mach/gpio.h:195:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_D_periph'
arch/arm/mach-at91/include/mach/gpio.h:196:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_gpio_input'
arch/arm/mach-at91/include/mach/gpio.h:197:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_gpio_output'
arch/arm/mach-at91/include/mach/gpio.h:198:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_deglitch'
arch/arm/mach-at91/include/mach/gpio.h:199:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_debounce'
arch/arm/mach-at91/include/mach/gpio.h:200:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_multi_drive'
arch/arm/mach-at91/include/mach/gpio.h:201:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_set_pulldown'
arch/arm/mach-at91/include/mach/gpio.h:202:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'at91_disable_schmitt_trig'
make[3]: *** [drivers/input/touchscreen/ads7846.o] Error 1
Fix it up in advance by including module.h explicitly.
Cc: Andrew Victor <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Cc: Jean-Christophe Plagniol-Villard <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/arm/mach-at91/include/mach/gpio.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 5fc2377..78abd64 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -14,6 +14,7 @@
#define __ASM_ARCH_AT91RM9200_GPIO_H
#include <linux/kernel.h>
+#include <linux/module.h> /* for __init_or_module */
#include <asm/irq.h>
#define MAX_GPIO_BANKS 5
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Mike Frysinger <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/blackfin/mach-common/cache-c.c | 1 -
arch/blackfin/mach-common/clocks-init.c | 1 -
arch/blackfin/mach-common/scb-init.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/arch/blackfin/mach-common/cache-c.c b/arch/blackfin/mach-common/cache-c.c
index 0e1e451..1a5a288 100644
--- a/arch/blackfin/mach-common/cache-c.c
+++ b/arch/blackfin/mach-common/cache-c.c
@@ -6,7 +6,6 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/init.h>
#include <asm/blackfin.h>
#include <asm/cplbinit.h>
diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c
index 2308ce5..d436bd9 100644
--- a/arch/blackfin/mach-common/clocks-init.c
+++ b/arch/blackfin/mach-common/clocks-init.c
@@ -7,7 +7,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/blackfin.h>
#include <asm/dma.h>
diff --git a/arch/blackfin/mach-common/scb-init.c b/arch/blackfin/mach-common/scb-init.c
index 2cbfb0b..8923398 100644
--- a/arch/blackfin/mach-common/scb-init.c
+++ b/arch/blackfin/mach-common/scb-init.c
@@ -6,7 +6,6 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <asm/scb.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Martin Schwidefsky <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Ursula Braun <[email protected]>
Cc: Frank Blaschka <[email protected]>
Cc: Steffen Maier <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/s390/block/dasd_erp.c | 1 -
drivers/s390/char/tape_34xx.c | 1 -
drivers/s390/char/tape_3590.c | 1 -
drivers/s390/char/tape_class.h | 1 -
drivers/s390/char/tape_core.c | 1 -
drivers/s390/cio/airq.c | 1 -
drivers/s390/cio/device_ops.c | 1 -
drivers/s390/cio/device_status.c | 1 -
drivers/s390/net/ctcm_dbug.c | 1 -
drivers/s390/net/ctcm_fsms.c | 1 -
drivers/s390/net/ctcm_fsms.h | 1 -
drivers/s390/net/ctcm_mpc.c | 1 -
drivers/s390/scsi/zfcp_def.h | 1 -
13 files changed, 13 deletions(-)
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index e1e8848..0b9f823 100644
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -11,7 +11,6 @@
#define KMSG_COMPONENT "dasd"
#include <linux/ctype.h>
-#include <linux/init.h>
#include <asm/debug.h>
#include <asm/ebcdic.h>
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 9aa7970..2e3eb6a 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -11,7 +11,6 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/bio.h>
#include <linux/workqueue.h>
#include <linux/slab.h>
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 327cb19..e979c76 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/bio.h>
#include <asm/ebcdic.h>
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index a332c10..444ffdf 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -9,7 +9,6 @@
#ifndef __TAPE_CLASS_H__
#define __TAPE_CLASS_H__
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/major.h>
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index f3b5123..6edf6ae 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -14,7 +14,6 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/module.h>
-#include <linux/init.h> // for kernel parameters
#include <linux/kmod.h> // for requesting modules
#include <linux/spinlock.h> // for locks
#include <linux/vmalloc.h>
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index f055df0..897209a 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -8,7 +8,6 @@
* Peter Oberparleiter <[email protected]>
*/
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/kernel_stat.h>
#include <linux/module.h>
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 4845d64..09de935 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -5,7 +5,6 @@
* Cornelia Huck ([email protected])
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/list.h>
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index 15b56a1..323fa37 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -7,7 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <asm/ccwdev.h>
#include <asm/cio.h>
diff --git a/drivers/s390/net/ctcm_dbug.c b/drivers/s390/net/ctcm_dbug.c
index 8363f1c9..7fc399a 100644
--- a/drivers/s390/net/ctcm_dbug.c
+++ b/drivers/s390/net/ctcm_dbug.c
@@ -11,7 +11,6 @@
#include <linux/ctype.h>
#include <linux/sysctl.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/debugfs.h>
#include "ctcm_dbug.h"
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index fb92524..0d64046 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -15,7 +15,6 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/errno.h>
diff --git a/drivers/s390/net/ctcm_fsms.h b/drivers/s390/net/ctcm_fsms.h
index c963d04..0ae2e8c 100644
--- a/drivers/s390/net/ctcm_fsms.h
+++ b/drivers/s390/net/ctcm_fsms.h
@@ -10,7 +10,6 @@
#define _CTCM_FSMS_H_
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/errno.h>
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 2dbc77b..f39bd3c 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -21,7 +21,6 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/errno.h>
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index d91173f..553eba9 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -11,7 +11,6 @@
/*************************** INCLUDES *****************************************/
-#include <linux/init.h>
#include <linux/moduleparam.h>
#include <linux/major.h>
#include <linux/blkdev.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Karsten Keil <[email protected]>
Cc: Armin Schindler <[email protected]> (maintainer:ISDN SUBSYSTEM
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/isdn/hardware/avm/avm_cs.c | 1 -
drivers/isdn/hardware/eicon/platform.h | 1 -
drivers/isdn/hisax/amd7930_fn.c | 1 -
drivers/isdn/hisax/asuscom.c | 1 -
drivers/isdn/hisax/avm_a1.c | 1 -
drivers/isdn/hisax/avm_a1p.c | 1 -
drivers/isdn/hisax/avma1_cs.c | 1 -
drivers/isdn/hisax/bkm_a4t.c | 1 -
drivers/isdn/hisax/bkm_a8.c | 1 -
drivers/isdn/hisax/diva.c | 1 -
drivers/isdn/hisax/elsa.c | 1 -
drivers/isdn/hisax/elsa_cs.c | 1 -
drivers/isdn/hisax/enternow_pci.c | 1 -
drivers/isdn/hisax/fsm.c | 1 -
drivers/isdn/hisax/gazel.c | 1 -
drivers/isdn/hisax/hfc_2bds0.c | 1 -
drivers/isdn/hisax/hfc_2bs0.c | 1 -
drivers/isdn/hisax/hfc_pci.c | 1 -
drivers/isdn/hisax/hfc_sx.c | 1 -
drivers/isdn/hisax/hfcscard.c | 1 -
drivers/isdn/hisax/hscx.c | 1 -
drivers/isdn/hisax/icc.c | 1 -
drivers/isdn/hisax/ipacx.c | 1 -
drivers/isdn/hisax/isac.c | 1 -
drivers/isdn/hisax/isar.c | 1 -
drivers/isdn/hisax/isurf.c | 1 -
drivers/isdn/hisax/ix1_micro.c | 1 -
drivers/isdn/hisax/jade.c | 1 -
drivers/isdn/hisax/mic.c | 1 -
drivers/isdn/hisax/netjet.c | 1 -
drivers/isdn/hisax/niccy.c | 1 -
drivers/isdn/hisax/nj_s.c | 1 -
drivers/isdn/hisax/nj_u.c | 1 -
drivers/isdn/hisax/s0box.c | 1 -
drivers/isdn/hisax/saphir.c | 1 -
drivers/isdn/hisax/sedlbauer.c | 1 -
drivers/isdn/hisax/sedlbauer_cs.c | 1 -
drivers/isdn/hisax/sportster.c | 1 -
drivers/isdn/hisax/st5481_b.c | 1 -
drivers/isdn/hisax/st5481_usb.c | 1 -
drivers/isdn/hisax/teleint.c | 1 -
drivers/isdn/hisax/teles0.c | 1 -
drivers/isdn/hisax/teles3.c | 1 -
drivers/isdn/hisax/teles_cs.c | 1 -
drivers/isdn/hisax/telespci.c | 1 -
drivers/isdn/hisax/w6692.c | 1 -
drivers/isdn/i4l/isdnhdlc.c | 1 -
47 files changed, 47 deletions(-)
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 62b8030..4332bd8 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/string.h>
#include <linux/tty.h>
diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h
index b2edb75..b034ac1 100644
--- a/drivers/isdn/hardware/eicon/platform.h
+++ b/drivers/isdn/hardware/eicon/platform.h
@@ -19,7 +19,6 @@
#endif
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/skbuff.h>
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index 36817e0..4d437f2 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -58,7 +58,6 @@
#include "isac.h"
#include "amd7930_fn.h"
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/gfp.h>
static void Amd7930_new_ph(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index 62f9c43..cdbbec7 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -12,7 +12,6 @@
*
*/
-#include <linux/init.h>
#include <linux/isapnp.h>
#include "hisax.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c
index 7dd7408..d3dbf02 100644
--- a/drivers/isdn/hisax/avm_a1.c
+++ b/drivers/isdn/hisax/avm_a1.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c
index bc52d54..50f1b1a 100644
--- a/drivers/isdn/hisax/avm_a1p.c
+++ b/drivers/isdn/hisax/avm_a1p.c
@@ -13,7 +13,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index baad94e..cf305b5 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index c360164..8ac171b 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -11,7 +11,6 @@
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index dd663ea..20ad1f7 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -11,7 +11,6 @@
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "ipac.h"
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 4fc90de..c8d2682 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -15,7 +15,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 2be1c8a..bdf952b 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -18,7 +18,6 @@
*
*/
-#include <linux/init.h>
#include <linux/slab.h>
#include "hisax.h"
#include "arcofi.h"
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 40f6fad..ca35784 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -37,7 +37,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index e8d431a..2fd3886 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -67,7 +67,6 @@
#include <linux/interrupt.h>
#include <linux/ppp_defs.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include "netjet.h"
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c
index c7a9471..61db6fa 100644
--- a/drivers/isdn/hisax/fsm.c
+++ b/drivers/isdn/hisax/fsm.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include "hisax.h"
#define FSM_TIMER_DEBUG 0
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 35c6df6..5157ac7 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -11,7 +11,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index a756e5c..17fcbbd 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include "hisax.h"
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index 838531b..2e2c319 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "hfc_2bs0.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 4a48255..5d8a1c7 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -15,7 +15,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "hfc_pci.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index fa1fefd..99c7f09 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -11,7 +11,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "hfc_sx.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 394da64..1b69f0c 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include <linux/isapnp.h>
#include "hisax.h"
#include "hfc_2bds0.h"
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
index 3e305fe..8c237dc 100644
--- a/drivers/isdn/hisax/hscx.c
+++ b/drivers/isdn/hisax/hscx.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "hscx.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index 51dae91..575700f 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -14,7 +14,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "icc.h"
// #include "arcofi.h"
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index 5faa5de..d522dfb 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -11,7 +11,6 @@
*/
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include "hisax_if.h"
#include "hisax.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 7fdf78f..e671728 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -19,7 +19,6 @@
#include "isdnl1.h"
#include <linux/interrupt.h>
#include <linux/slab.h>
-#include <linux/init.h>
#define DBUSY_TIMER_VALUE 80
#define ARCOFI_USE 1
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index f4956c7..993c6f3 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -8,7 +8,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isar.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index 1399ddd..0d5849f 100644
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "isar.h"
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 7ae39f5..7d3b35c 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -17,7 +17,6 @@
* Germany
*/
-#include <linux/init.h>
#include <linux/isapnp.h>
#include "hisax.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index e2ae787..f2c24f7 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -11,7 +11,6 @@
*/
-#include <linux/init.h>
#include "hisax.h"
#include "hscx.h"
#include "jade.h"
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index 9339867..6cf1367 100644
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 233e432..93b10a5 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -14,7 +14,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index e4c33cf..480cc66 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -13,7 +13,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index 32b4bbd..3c43f52 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -5,7 +5,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c
index 4e8adbe..9f6eaab 100644
--- a/drivers/isdn/hisax/nj_u.c
+++ b/drivers/isdn/hisax/nj_u.c
@@ -5,7 +5,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "icc.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c
index 4e7d0aa..3749b09 100644
--- a/drivers/isdn/hisax/s0box.c
+++ b/drivers/isdn/hisax/s0box.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index 6b2d0ec..dc36783 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -12,7 +12,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index f16a47b..1b9459f 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -38,7 +38,6 @@
* For example: hisaxctrl <DriverID> 9 ISAR.BIN
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "ipac.h"
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 92ef62d..f738f26 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c
index 18cee63..943a186 100644
--- a/drivers/isdn/hisax/sportster.c
+++ b/drivers/isdn/hisax/sportster.c
@@ -12,7 +12,6 @@
*
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 4098491..ca141d6 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include <linux/gfp.h>
#include <linux/usb.h>
#include <linux/netdevice.h>
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index ead0a4f..ee78014 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include <linux/usb.h>
#include <linux/slab.h>
#include "st5481.h"
diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c
index bf64754..d947abc 100644
--- a/drivers/isdn/hisax/teleint.c
+++ b/drivers/isdn/hisax/teleint.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hfc_2bs0.h"
diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
index ce9eabd..bd439a9 100644
--- a/drivers/isdn/hisax/teles0.c
+++ b/drivers/isdn/hisax/teles0.c
@@ -15,7 +15,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isdnl1.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 38fb2c1..c608d80 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -13,7 +13,6 @@
* Beat Doebeli
*
*/
-#include <linux/init.h>
#include <linux/isapnp.h>
#include "hisax.h"
#include "isac.h"
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index b8dd149..c0e532e 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index 33eeb46..f9b2169 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -12,7 +12,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index a858955..7e0c60c 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/init.h>
#include "hisax.h"
#include "w6692.h"
#include "isdnl1.h"
diff --git a/drivers/isdn/i4l/isdnhdlc.c b/drivers/isdn/i4l/isdnhdlc.c
index 027d1c5..5daace1 100644
--- a/drivers/isdn/i4l/isdnhdlc.c
+++ b/drivers/isdn/i4l/isdnhdlc.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/crc-ccitt.h>
#include <linux/isdn/hdlc.h>
#include <linux/bitrev.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Wim Van Sebroeck <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/watchdog/ar7_wdt.c | 1 -
drivers/watchdog/ath79_wdt.c | 1 -
drivers/watchdog/bcm47xx_wdt.c | 1 -
drivers/watchdog/bcm63xx_wdt.c | 1 -
drivers/watchdog/cpu5wdt.c | 1 -
drivers/watchdog/cpwd.c | 1 -
drivers/watchdog/davinci_wdt.c | 1 -
drivers/watchdog/hpwdt.c | 1 -
drivers/watchdog/i6300esb.c | 1 -
drivers/watchdog/jz4740_wdt.c | 1 -
drivers/watchdog/max63xx_wdt.c | 1 -
drivers/watchdog/mtx-1_wdt.c | 1 -
drivers/watchdog/nuc900_wdt.c | 1 -
drivers/watchdog/of_xilinx_wdt.c | 1 -
drivers/watchdog/omap_wdt.c | 1 -
drivers/watchdog/orion_wdt.c | 1 -
drivers/watchdog/pnx4008_wdt.c | 1 -
drivers/watchdog/rdc321x_wdt.c | 1 -
drivers/watchdog/retu_wdt.c | 1 -
drivers/watchdog/riowd.c | 1 -
drivers/watchdog/s3c2410_wdt.c | 1 -
drivers/watchdog/sp805_wdt.c | 1 -
drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 -
drivers/watchdog/wdt_pci.c | 1 -
24 files changed, 24 deletions(-)
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 3a99657..ae6c287 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -28,7 +28,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 9fa1f69..399c3fd 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -22,7 +22,6 @@
#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/miscdevice.h>
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index b4021a2..b61fcc5 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -16,7 +16,6 @@
#include <linux/bcm47xx_wdt.h>
#include <linux/bitops.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index 4eb188b..3fb18bb 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -15,7 +15,6 @@
#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/miscdevice.h>
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index f7ae49e..6d03e8e 100644
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -27,7 +27,6 @@
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
#include <linux/completion.h>
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 213225e..e55ed70 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -21,7 +21,6 @@
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/major.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index b1bae03..d09ad22 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -16,7 +16,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/device.h>
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 2b75e8b..75d2243 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -17,7 +17,6 @@
#include <linux/device.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/bitops.h>
#include <linux/kernel.h>
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 25a2bfd..d7befd5 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -36,7 +36,6 @@
#include <linux/mm.h>
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/uaccess.h>
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 3aa50cf..91e45ca 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -18,7 +18,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/device.h>
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index bdb3f4a..0e9cc6f 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -20,7 +20,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index edb31ff..ff27c4a 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -40,7 +40,6 @@
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
#include <linux/completion.h>
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index a0d893b..7135803 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -12,7 +12,6 @@
#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/kernel.h>
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index fb57103..19fa92d01 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/watchdog.h>
#include <linux/io.h>
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 09cf013..fbcb6f6 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -34,7 +34,6 @@
#include <linux/mm.h>
#include <linux/watchdog.h>
#include <linux/reboot.h>
-#include <linux/init.h>
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/moduleparam.h>
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index f7722a4..4981634 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/clk.h>
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 5bec20f..15fb316 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -24,7 +24,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/spinlock.h>
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 082d062..29cf4dc 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -27,7 +27,6 @@
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/timer.h>
#include <linux/completion.h>
diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c
index f53615d..a7a0695 100644
--- a/drivers/watchdog/retu_wdt.c
+++ b/drivers/watchdog/retu_wdt.c
@@ -16,7 +16,6 @@
* GNU General Public License for more details.
*/
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/device.h>
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 3dd8ed2..cfed0fe 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -10,7 +10,6 @@
#include <linux/types.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/of.h>
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index aec946d..aba6cd4 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -30,7 +30,6 @@
#include <linux/types.h>
#include <linux/timer.h>
#include <linux/watchdog.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <linux/clk.h>
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 3f786ce..6ee6db1 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -16,7 +16,6 @@
#include <linux/amba/bus.h>
#include <linux/bitops.h>
#include <linux/clk.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index bb64ae3..3804d5e 100644
--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
@@ -9,7 +9,6 @@
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/watchdog.h>
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 3dc578e..48b2c05 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -49,7 +49,6 @@
#include <linux/delay.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/pci.h>
#include <linux/io.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/arm/common/dmabounce.c | 1 -
arch/arm/firmware/trusted_foundations.c | 1 -
arch/arm/include/asm/arch_timer.h | 1 -
arch/arm/kernel/entry-header.S | 1 -
arch/arm/kernel/hyp-stub.S | 1 -
arch/arm/kernel/suspend.c | 1 -
arch/arm/kernel/unwind.c | 1 -
arch/arm/mach-cns3xxx/pm.c | 1 -
arch/arm/mach-exynos/headsmp.S | 1 -
arch/arm/mach-footbridge/personal.c | 1 -
arch/arm/mach-imx/headsmp.S | 1 -
arch/arm/mach-imx/iomux-v3.c | 1 -
arch/arm/mach-iop33x/uart.c | 1 -
arch/arm/mach-msm/headsmp.S | 1 -
arch/arm/mach-msm/proc_comm.h | 1 -
arch/arm/mach-mvebu/headsmp.S | 1 -
arch/arm/mach-netx/fb.c | 1 -
arch/arm/mach-netx/pfifo.c | 1 -
arch/arm/mach-netx/xc.c | 1 -
arch/arm/mach-nspire/clcd.c | 1 -
arch/arm/mach-omap1/fpga.c | 1 -
arch/arm/mach-omap1/include/mach/serial.h | 1 -
arch/arm/mach-omap2/omap-headsmp.S | 1 -
arch/arm/mach-omap2/omap3-restart.c | 1 -
arch/arm/mach-omap2/vc3xxx_data.c | 1 -
arch/arm/mach-omap2/vc44xx_data.c | 1 -
arch/arm/mach-omap2/vp3xxx_data.c | 1 -
arch/arm/mach-omap2/vp44xx_data.c | 1 -
arch/arm/mach-prima2/headsmp.S | 1 -
arch/arm/mach-pxa/clock-pxa2xx.c | 1 -
arch/arm/mach-pxa/clock-pxa3xx.c | 1 -
arch/arm/mach-pxa/corgi_pm.c | 1 -
arch/arm/mach-pxa/mfp-pxa3xx.c | 1 -
arch/arm/mach-pxa/spitz_pm.c | 1 -
arch/arm/mach-s3c24xx/clock-s3c244x.c | 1 -
arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 1 -
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 1 -
arch/arm/mach-s3c24xx/irq-pm.c | 1 -
arch/arm/mach-s3c24xx/pm.c | 1 -
arch/arm/mach-s5p64x0/clock.c | 1 -
arch/arm/mach-sa1100/ssp.c | 1 -
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 1 -
arch/arm/mach-shmobile/platsmp.c | 1 -
arch/arm/mach-shmobile/sleep-sh7372.S | 1 -
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-sti/headsmp.S | 1 -
arch/arm/mach-sunxi/headsmp.S | 1 -
arch/arm/mach-tegra/flowctrl.c | 1 -
arch/arm/mach-tegra/headsmp.S | 1 -
arch/arm/mach-tegra/reset-handler.S | 1 -
arch/arm/mach-u300/dummyspichip.c | 1 -
arch/arm/mach-ux500/board-mop500-audio.c | 1 -
arch/arm/mach-ux500/headsmp.S | 1 -
arch/arm/mach-versatile/versatile_ab.c | 1 -
arch/arm/mach-zynq/headsmp.S | 1 -
arch/arm/mm/hugetlbpage.c | 1 -
arch/arm/plat-iop/i2c.c | 1 -
arch/arm/plat-samsung/pm-check.c | 1 -
arch/arm/plat-samsung/pm-gpio.c | 1 -
arch/arm/plat-samsung/s5p-irq-pm.c | 1 -
arch/arm/plat-versatile/headsmp.S | 1 -
arch/arm/plat-versatile/platsmp.c | 1 -
63 files changed, 63 deletions(-)
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index 1143c4d..ee568605 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/page-flags.h>
#include <linux/device.h>
diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c
index ef1e3d8..a07fc24 100644
--- a/arch/arm/firmware/trusted_foundations.c
+++ b/arch/arm/firmware/trusted_foundations.c
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/of.h>
#include <asm/firmware.h>
#include <asm/trusted_foundations.h>
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 0704e0c..30cc2fb 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -4,7 +4,6 @@
#include <asm/barrier.h>
#include <asm/errno.h>
#include <linux/clocksource.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <clocksource/arm_arch_timer.h>
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 39f89fb..989ca33 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 797b1a6..54bbb51 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -16,7 +16,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/virt.h>
diff --git a/arch/arm/kernel/suspend.c b/arch/arm/kernel/suspend.c
index 2835d35..59afe38 100644
--- a/arch/arm/kernel/suspend.c
+++ b/arch/arm/kernel/suspend.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/slab.h>
#include <asm/cacheflush.h>
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 00df012..eb05820 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -38,7 +38,6 @@
#endif /* __CHECKER__ */
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff --git a/arch/arm/mach-cns3xxx/pm.c b/arch/arm/mach-cns3xxx/pm.c
index fb38c72..e10635f 100644
--- a/arch/arm/mach-cns3xxx/pm.c
+++ b/arch/arm/mach-cns3xxx/pm.c
@@ -6,7 +6,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
index cdd9d91..b6c8617 100644
--- a/arch/arm/mach-exynos/headsmp.S
+++ b/arch/arm/mach-exynos/headsmp.S
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
/*
* exynos4 specific entry point for secondary CPUs. This provides
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 7bdeabd..1964734 100644
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -3,7 +3,6 @@
*
* Personal server (Skiff) machine fixup
*/
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <asm/hardware/dec21285.h>
diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S
index 627f16f..3b47e8f 100644
--- a/arch/arm/mach-imx/headsmp.S
+++ b/arch/arm/mach-imx/headsmp.S
@@ -11,7 +11,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/asm-offsets.h>
#include <asm/hardware/cache-l2x0.h>
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 9dae74b..e1de1b2 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -19,7 +19,6 @@
* MA 02110-1301, USA.
*/
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c
index bbf54d7..2c8a35f 100644
--- a/arch/arm/mach-iop33x/uart.c
+++ b/arch/arm/mach-iop33x/uart.c
@@ -10,7 +10,6 @@
*/
#include <linux/mm.h>
-#include <linux/init.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
diff --git a/arch/arm/mach-msm/headsmp.S b/arch/arm/mach-msm/headsmp.S
index 6c62c3f..d41bbbf 100644
--- a/arch/arm/mach-msm/headsmp.S
+++ b/arch/arm/mach-msm/headsmp.S
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
/*
* MSM specific entry point for secondary CPUs. This provides
diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
index e8d043a..63fd358 100644
--- a/arch/arm/mach-msm/proc_comm.h
+++ b/arch/arm/mach-msm/proc_comm.h
@@ -16,7 +16,6 @@
#ifndef _ARCH_ARM_MACH_MSM_PROC_COMM_H_
#define _ARCH_ARM_MACH_MSM_PROC_COMM_H_
-#include <linux/init.h>
enum {
PCOM_CMD_IDLE = 0x0,
diff --git a/arch/arm/mach-mvebu/headsmp.S b/arch/arm/mach-mvebu/headsmp.S
index 3dd80df..7d77ef7 100644
--- a/arch/arm/mach-mvebu/headsmp.S
+++ b/arch/arm/mach-mvebu/headsmp.S
@@ -19,7 +19,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/assembler.h>
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index d122ee6..40b3c12 100644
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -18,7 +18,6 @@
*/
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
diff --git a/arch/arm/mach-netx/pfifo.c b/arch/arm/mach-netx/pfifo.c
index 0398494..8e1856d 100644
--- a/arch/arm/mach-netx/pfifo.c
+++ b/arch/arm/mach-netx/pfifo.c
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c
index f1c972d..d9aea9c 100644
--- a/arch/arm/mach-netx/xc.c
+++ b/arch/arm/mach-netx/xc.c
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/firmware.h>
#include <linux/mutex.h>
diff --git a/arch/arm/mach-nspire/clcd.c b/arch/arm/mach-nspire/clcd.c
index abea126..92c1557 100644
--- a/arch/arm/mach-nspire/clcd.c
+++ b/arch/arm/mach-nspire/clcd.c
@@ -9,7 +9,6 @@
*
*/
-#include <linux/init.h>
#include <linux/of.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 3c0e422..a8a492a 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -18,7 +18,6 @@
#include <linux/types.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-omap1/include/mach/serial.h b/arch/arm/mach-omap1/include/mach/serial.h
index 2ce6a2d..0ad7fe9 100644
--- a/arch/arm/mach-omap1/include/mach/serial.h
+++ b/arch/arm/mach-omap1/include/mach/serial.h
@@ -11,7 +11,6 @@
#ifndef __ASM_ARCH_SERIAL_H
#define __ASM_ARCH_SERIAL_H
-#include <linux/init.h>
/*
* Memory entry used for the DEBUG_LL UART configuration, relative to
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 75e9295..4259a17 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -16,7 +16,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include "omap44xx.h"
diff --git a/arch/arm/mach-omap2/omap3-restart.c b/arch/arm/mach-omap2/omap3-restart.c
index 5de2a0c..5b457fb 100644
--- a/arch/arm/mach-omap2/omap3-restart.c
+++ b/arch/arm/mach-omap2/omap3-restart.c
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/reboot.h>
#include "iomap.h"
diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c
index 75bc4aa..1cdd18a 100644
--- a/arch/arm/mach-omap2/vc3xxx_data.c
+++ b/arch/arm/mach-omap2/vc3xxx_data.c
@@ -16,7 +16,6 @@
*/
#include <linux/io.h>
#include <linux/err.h>
-#include <linux/init.h>
#include "common.h"
diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c
index 085e5d6..6134cfd 100644
--- a/arch/arm/mach-omap2/vc44xx_data.c
+++ b/arch/arm/mach-omap2/vc44xx_data.c
@@ -16,7 +16,6 @@
*/
#include <linux/io.h>
#include <linux/err.h>
-#include <linux/init.h>
#include "common.h"
diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c
index 1914e02..f99ca62 100644
--- a/arch/arm/mach-omap2/vp3xxx_data.c
+++ b/arch/arm/mach-omap2/vp3xxx_data.c
@@ -17,7 +17,6 @@
#include <linux/io.h>
#include <linux/err.h>
-#include <linux/init.h>
#include "common.h"
diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c
index e62f6b0..9036d26 100644
--- a/arch/arm/mach-omap2/vp44xx_data.c
+++ b/arch/arm/mach-omap2/vp44xx_data.c
@@ -17,7 +17,6 @@
#include <linux/io.h>
#include <linux/err.h>
-#include <linux/init.h>
#include "common.h"
diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S
index d86fe33..3567ea8 100644
--- a/arch/arm/mach-prima2/headsmp.S
+++ b/arch/arm/mach-prima2/headsmp.S
@@ -7,7 +7,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
/*
* SIRFSOC specific entry point for secondary CPUs. This provides
diff --git a/arch/arm/mach-pxa/clock-pxa2xx.c b/arch/arm/mach-pxa/clock-pxa2xx.c
index 9ee2ad6..0d9a905 100644
--- a/arch/arm/mach-pxa/clock-pxa2xx.c
+++ b/arch/arm/mach-pxa/clock-pxa2xx.c
@@ -8,7 +8,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/syscore_ops.h>
diff --git a/arch/arm/mach-pxa/clock-pxa3xx.c b/arch/arm/mach-pxa/clock-pxa3xx.c
index d4e9499..1dab509 100644
--- a/arch/arm/mach-pxa/clock-pxa3xx.c
+++ b/arch/arm/mach-pxa/clock-pxa3xx.c
@@ -8,7 +8,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/syscore_ops.h>
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 7a39efc..aa38aab 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/stat.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/gpio.h>
diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c
index 89863a0..1c4de06 100644
--- a/arch/arm/mach-pxa/mfp-pxa3xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa3xx.c
@@ -15,7 +15,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/syscore_ops.h>
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index e191f99..24318fe 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/stat.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/gpio.h>
diff --git a/arch/arm/mach-s3c24xx/clock-s3c244x.c b/arch/arm/mach-s3c24xx/clock-s3c244x.c
index 6d9b688..71f5852 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c244x.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c244x.c
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/list.h>
diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
index 4cd13ab..8e0228b 100644
--- a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/cpufreq.h>
diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
index bd064c0..d695764 100644
--- a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/arch/arm/mach-s3c24xx/irq-pm.c b/arch/arm/mach-s3c24xx/irq-pm.c
index b91341e..12ed85f 100644
--- a/arch/arm/mach-s3c24xx/irq-pm.c
+++ b/arch/arm/mach-s3c24xx/irq-pm.c
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c
index 052ca23..6749ebb 100644
--- a/arch/arm/mach-s3c24xx/pm.c
+++ b/arch/arm/mach-s3c24xx/pm.c
@@ -26,7 +26,6 @@
* Thanks to Dimitry Andric for debugging
*/
-#include <linux/init.h>
#include <linux/suspend.h>
#include <linux/errno.h>
#include <linux/time.h>
diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c
index 57e7189..e0e802f6 100644
--- a/arch/arm/mach-s5p64x0/clock.c
+++ b/arch/arm/mach-s5p64x0/clock.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/list.h>
diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index e22fca9..dd04880 100644
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -16,7 +16,6 @@
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <mach/hardware.h>
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index f45dde7..df583ef 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -20,7 +20,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/memory.h>
/*
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index e5be5c8..8189e46 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -11,7 +11,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/memory.h>
ENTRY(shmobile_invalidate_start)
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 9ebc246..73cf12c 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -10,7 +10,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <mach/common.h>
diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S
index 9782862..df35418 100644
--- a/arch/arm/mach-shmobile/sleep-sh7372.S
+++ b/arch/arm/mach-shmobile/sleep-sh7372.S
@@ -30,7 +30,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/memory.h>
#include <asm/assembler.h>
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 95c115d..eb59d39 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -8,7 +8,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
.arch armv7-a
diff --git a/arch/arm/mach-sti/headsmp.S b/arch/arm/mach-sti/headsmp.S
index 4c09bae..66eb429 100644
--- a/arch/arm/mach-sti/headsmp.S
+++ b/arch/arm/mach-sti/headsmp.S
@@ -14,7 +14,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
/*
* ST specific entry point for secondary CPUs. This provides
diff --git a/arch/arm/mach-sunxi/headsmp.S b/arch/arm/mach-sunxi/headsmp.S
index a10d494..8bcc5c9 100644
--- a/arch/arm/mach-sunxi/headsmp.S
+++ b/arch/arm/mach-sunxi/headsmp.S
@@ -1,5 +1,4 @@
#include <linux/linkage.h>
-#include <linux/init.h>
.section ".text.head", "ax"
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index ce8ab8a..43ae750 100644
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/cpumask.h>
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S
index 2072e73..8239a04 100644
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@ -1,5 +1,4 @@
#include <linux/linkage.h>
-#include <linux/init.h>
#include "sleep.h"
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S
index 8c1ba4f..9aa6cd3 100644
--- a/arch/arm/mach-tegra/reset-handler.S
+++ b/arch/arm/mach-tegra/reset-handler.S
@@ -15,7 +15,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/cache.h>
#include <asm/asm-offsets.h>
diff --git a/arch/arm/mach-u300/dummyspichip.c b/arch/arm/mach-u300/dummyspichip.c
index ec0283c..59043aa 100644
--- a/arch/arm/mach-u300/dummyspichip.c
+++ b/arch/arm/mach-u300/dummyspichip.c
@@ -6,7 +6,6 @@
* This is a dummy loopback SPI "chip" used for testing SPI.
* Author: Linus Walleij <[email protected]>
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index 9309ad4..f5b4bdd 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -5,7 +5,6 @@
*/
#include <linux/platform_device.h>
-#include <linux/init.h>
#include <linux/gpio.h>
#include <linux/platform_data/dma-ste-dma40.h>
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S
index 9cdea04..9f2887e 100644
--- a/arch/arm/mach-ux500/headsmp.S
+++ b/arch/arm/mach-ux500/headsmp.S
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
/*
* U8500 specific entry point for secondary CPUs.
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index 1caef10..b629bd8 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/amba/bus.h>
#include <linux/io.h>
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index 57a3286..e9cf28b 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -7,7 +7,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
ENTRY(zynq_secondary_trampoline)
ldr r0, [pc]
diff --git a/arch/arm/mm/hugetlbpage.c b/arch/arm/mm/hugetlbpage.c
index 54ee616..e5ce0e14 100644
--- a/arch/arm/mm/hugetlbpage.c
+++ b/arch/arm/mm/hugetlbpage.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/hugetlb.h>
diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c
index 88215ad..9886bbc 100644
--- a/arch/arm/plat-iop/i2c.c
+++ b/arch/arm/plat-iop/i2c.c
@@ -11,7 +11,6 @@
*/
#include <linux/mm.h>
-#include <linux/init.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c
index 3cbd626..0ec4edb 100644
--- a/arch/arm/plat-samsung/pm-check.c
+++ b/arch/arm/plat-samsung/pm-check.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/suspend.h>
-#include <linux/init.h>
#include <linux/crc32.h>
#include <linux/ioport.h>
#include <linux/slab.h>
diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index dd4c15d0..4be6658 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/device.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/gpio.h>
diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c
index 5914980..009ee74 100644
--- a/arch/arm/plat-samsung/s5p-irq-pm.c
+++ b/arch/arm/plat-samsung/s5p-irq-pm.c
@@ -12,7 +12,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S
index 40f27e5..7e04098 100644
--- a/arch/arm/plat-versatile/headsmp.S
+++ b/arch/arm/plat-versatile/headsmp.S
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/assembler.h>
/*
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
index 53feb90..934c512 100644
--- a/arch/arm/plat-versatile/platsmp.c
+++ b/arch/arm/plat-versatile/platsmp.c
@@ -8,7 +8,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/device.h>
--
1.8.4.1
Despite the name mach-crag6410-module.c, the code is built for
MACH_WLF_CRAGG_6410 -- which is bool, and hence this code is
either present or absent. It will never be modular, so using
module_init as an alias for __initcall can be somewhat
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Ben Dooks <[email protected]>
Cc: Kukjin Kim <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 7ccfef2..9c00d83 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -401,4 +401,4 @@ static int __init wlf_gf_module_register(void)
{
return i2c_add_driver(&wlf_gf_module_driver);
}
-module_init(wlf_gf_module_register);
+device_initcall(wlf_gf_module_register);
--
1.8.4.1
The spc.o is built for ARCH_VEXPRESS_SPC -- which is bool, and hence
this code is either present or absent. It will never be modular,
so using module_init as an alias for __initcall can be somewhat
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/arm/mach-vexpress/spc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index c26ef5b..9312a9b 100644
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -581,4 +581,4 @@ static int __init ve_spc_clk_init(void)
platform_device_register_simple("vexpress-spc-cpufreq", -1, NULL, 0);
return 0;
}
-module_init(ve_spc_clk_init);
+device_initcall(ve_spc_clk_init);
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Linus Walleij <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/pinctrl/mvebu/pinctrl-armada-370.c | 1 -
drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 1 -
drivers/pinctrl/mvebu/pinctrl-dove.c | 1 -
drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 1 -
drivers/pinctrl/pinconf-generic.c | 1 -
drivers/pinctrl/pinconf.c | 1 -
drivers/pinctrl/pinctrl-imx.c | 1 -
drivers/pinctrl/pinctrl-mxs.c | 1 -
drivers/pinctrl/pinctrl-single.c | 1 -
drivers/pinctrl/pinctrl-tegra.c | 1 -
drivers/pinctrl/pinmux.c | 1 -
drivers/pinctrl/sh-pfc/gpio.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7722.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7723.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7724.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7734.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7757.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7785.c | 1 -
drivers/pinctrl/sh-pfc/pfc-sh7786.c | 1 -
drivers/pinctrl/sh-pfc/pfc-shx3.c | 1 -
drivers/pinctrl/sh-pfc/pinctrl.c | 1 -
21 files changed, 21 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index ae1f760..268476f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -12,7 +12,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
index 843a51f..756c9f4 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -21,7 +21,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 4726839..cbfdef4 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -10,7 +10,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/bitops.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
index 6b504b5..d5c44b6 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -10,7 +10,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 3d9a999..90a46e0 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/debugfs.h>
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 8bfa064..10b02dc 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/debugfs.h>
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index 4779b8e..88a4feb 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -13,7 +13,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index 40c76f2..b2f7cc7 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -10,7 +10,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index de64596..41f1cfe 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -9,7 +9,6 @@
* warranty of any kind, whether express or implied.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/slab.h>
diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c
index a2e93a2..b2b6de0 100644
--- a/drivers/pinctrl/pinctrl-tegra.c
+++ b/drivers/pinctrl/pinctrl-tegra.c
@@ -19,7 +19,6 @@
*/
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 9248ce4..5e7ecf6 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/radix-tree.h>
diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index a9288ab..be02fb4 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -11,7 +11,6 @@
#include <linux/device.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pinctrl/consumer.h>
#include <linux/slab.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/sh-pfc/pfc-sh7722.c
index 914d872..14eab90 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7722.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7722.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <cpu/sh7722.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/sh-pfc/pfc-sh7723.c
index 4eb7eae..7fd316b 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7723.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7723.c
@@ -8,7 +8,6 @@
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7723.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7724.c b/drivers/pinctrl/sh-pfc/pfc-sh7724.c
index 74a1a7f..1a39418 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7724.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7724.c
@@ -13,7 +13,6 @@
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7724.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
index e53dd1c..4b9c34f 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7734.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
@@ -8,7 +8,6 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7734.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7757.c b/drivers/pinctrl/sh-pfc/pfc-sh7757.c
index 625661a..c6fba87 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7757.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7757.c
@@ -13,7 +13,6 @@
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7757.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7785.c b/drivers/pinctrl/sh-pfc/pfc-sh7785.c
index b38dd7e..34dab53 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7785.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7785.c
@@ -8,7 +8,6 @@
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7785.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7786.c b/drivers/pinctrl/sh-pfc/pfc-sh7786.c
index 6cb4e0a..5238cac 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh7786.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7786.c
@@ -13,7 +13,6 @@
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/sh7786.h>
diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c
index a3fcb22..691d432 100644
--- a/drivers/pinctrl/sh-pfc/pfc-shx3.c
+++ b/drivers/pinctrl/sh-pfc/pfc-shx3.c
@@ -7,7 +7,6 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <cpu/shx3.h>
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index e758af9..c30b370 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -12,7 +12,6 @@
#include <linux/device.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/pinctrl/consumer.h>
--
1.8.4.1
On Tue, Jan 21, 2014 at 04:22:53PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Jean Delvare <[email protected]>
> Cc: Guenter Roeck <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Hi Paul,
nice cleanup. I applied it to my local repository to run
a set of build tests with it.
Assuming the plan is to push the changes through your tree:
Acked-by: Guenter Roeck <[email protected]>
Guenter
On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker
<[email protected]> wrote:
> diff --git a/include/linux/zorro.h b/include/linux/zorro.h
> index 63fbba0..529604b 100644
> --- a/include/linux/zorro.h
> +++ b/include/linux/zorro.h
> @@ -15,7 +15,6 @@
> #include <uapi/linux/zorro.h>
>
> #include <linux/device.h>
> -#include <linux/init.h>
> #include <linux/ioport.h>
> #include <linux/mod_devicetable.h>
There's an __initdata below in that file:
extern struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Tejun Heo <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/ata/acard-ahci.c | 1 -
drivers/ata/ahci.c | 1 -
drivers/ata/ahci_platform.c | 1 -
drivers/ata/ata_generic.c | 1 -
drivers/ata/libahci.c | 1 -
drivers/ata/pata_acpi.c | 1 -
drivers/ata/pata_amd.c | 1 -
drivers/ata/pata_artop.c | 1 -
drivers/ata/pata_at91.c | 1 -
drivers/ata/pata_atiixp.c | 1 -
drivers/ata/pata_atp867x.c | 1 -
drivers/ata/pata_cmd640.c | 1 -
drivers/ata/pata_cmd64x.c | 1 -
drivers/ata/pata_cs5520.c | 1 -
drivers/ata/pata_cs5530.c | 1 -
drivers/ata/pata_cs5535.c | 1 -
drivers/ata/pata_cs5536.c | 1 -
drivers/ata/pata_cypress.c | 1 -
drivers/ata/pata_efar.c | 1 -
drivers/ata/pata_ep93xx.c | 1 -
drivers/ata/pata_hpt366.c | 1 -
drivers/ata/pata_hpt37x.c | 1 -
drivers/ata/pata_hpt3x2n.c | 1 -
drivers/ata/pata_hpt3x3.c | 1 -
drivers/ata/pata_imx.c | 1 -
drivers/ata/pata_it8213.c | 1 -
drivers/ata/pata_it821x.c | 1 -
drivers/ata/pata_jmicron.c | 1 -
drivers/ata/pata_marvell.c | 1 -
drivers/ata/pata_mpiix.c | 1 -
drivers/ata/pata_netcell.c | 1 -
drivers/ata/pata_ninja32.c | 1 -
drivers/ata/pata_ns87410.c | 1 -
drivers/ata/pata_ns87415.c | 1 -
drivers/ata/pata_oldpiix.c | 1 -
drivers/ata/pata_opti.c | 1 -
drivers/ata/pata_optidma.c | 1 -
drivers/ata/pata_pcmcia.c | 1 -
drivers/ata/pata_pdc2027x.c | 1 -
drivers/ata/pata_pdc202xx_old.c | 1 -
drivers/ata/pata_piccolo.c | 1 -
drivers/ata/pata_platform.c | 1 -
drivers/ata/pata_pxa.c | 1 -
drivers/ata/pata_radisys.c | 1 -
drivers/ata/pata_rdc.c | 1 -
drivers/ata/pata_rz1000.c | 1 -
drivers/ata/pata_sc1200.c | 1 -
drivers/ata/pata_scc.c | 1 -
drivers/ata/pata_sch.c | 1 -
drivers/ata/pata_serverworks.c | 1 -
drivers/ata/pata_sil680.c | 1 -
drivers/ata/pata_sis.c | 1 -
drivers/ata/pata_sl82c105.c | 1 -
drivers/ata/pata_triflex.c | 1 -
drivers/ata/pata_via.c | 1 -
drivers/ata/pdc_adma.c | 1 -
drivers/ata/sata_dwc_460ex.c | 1 -
drivers/ata/sata_highbank.c | 1 -
drivers/ata/sata_nv.c | 1 -
drivers/ata/sata_promise.c | 1 -
drivers/ata/sata_qstor.c | 1 -
drivers/ata/sata_sil.c | 1 -
drivers/ata/sata_sis.c | 1 -
drivers/ata/sata_svw.c | 1 -
drivers/ata/sata_sx4.c | 1 -
drivers/ata/sata_uli.c | 1 -
drivers/ata/sata_via.c | 1 -
drivers/ata/sata_vsc.c | 1 -
68 files changed, 68 deletions(-)
diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
index fd665d9..b51605a 100644
--- a/drivers/ata/acard-ahci.c
+++ b/drivers/ata/acard-ahci.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index dc2756f..b6a49ce 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 4b231ba..9302d81 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -17,7 +17,6 @@
#include <linux/gfp.h>
#include <linux/module.h>
#include <linux/pm.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/platform_device.h>
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 7d19665..9498a7d 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 36605ab..cba1b48 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 62c9ac8..5108b87 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index d23e2b3..1206fa6 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 1581dee..3aa4e65 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index d63ee8f..e9c8727 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/gfp.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 24e5105..30fa4ca 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
index 2ca5026..7e73a0f 100644
--- a/drivers/ata/pata_atp867x.c
+++ b/drivers/ata/pata_atp867x.c
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 8fb69e5..57f1be6 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 1275a8d..6bca350 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index f10baab..bcde4b7 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index f07f229..8afe854 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 997e16a..2c0986f 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 0448860..32ddcae 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/libata.h>
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 810bc99..3435bd6 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 3c12fd7..f440892 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 980b88e..cad9d45 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -34,7 +34,6 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 35b5213..8e76f79 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index a9d74ef..3ba843f 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 4be0398..b93c0f0 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 85cf286..255c5aa 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index 26386f0..97417d5 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -15,7 +15,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 2a8dd95..81369d1 100644
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 581e04d..dc3d787 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -72,7 +72,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 76e739b0..b1cfa02 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index a4f5e78..6bad3df 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 1f5f28b..f39a537 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index ad1a0fe..e3b9709 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -7,7 +7,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 9513e07..56201a6 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 0c424da..6154c3e 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index 16dc3a6..d44df7c 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index d77b2e1..319b644 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index 4ea70cd..fb042e0 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 78ede3f..bb71ea2 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 40254f4..bcc4b96 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 9d874c8..1151f23 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index c34fc50..defa050 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c
index 2beb6b5..0b46be1 100644
--- a/drivers/ata/pata_piccolo.c
+++ b/drivers/ata/pata_piccolo.c
@@ -18,7 +18,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 0279488..a5579b5 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -13,7 +13,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <scsi/scsi_host.h>
#include <linux/ata.h>
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index a6f05ac..73259bf 100644
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/ata.h>
#include <linux/libata.h>
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index f582ba1..be3f102 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
index 79a970f..521b213 100644
--- a/drivers/ata/pata_rdc.c
+++ b/drivers/ata/pata_rdc.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 040b093..caedc90 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index ce2f828..96a232f 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index f35f15f..f1f5b5a 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index d3830c4..5a1cde0 100644
--- a/drivers/ata/pata_sch.c
+++ b/drivers/ata/pata_sch.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 96c6a79..e27f31f 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index c4b0b07..73fe362 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 1e83636..78d913a 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 6816911..900f0e4 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 94473da..7bc78e2 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <scsi/scsi_host.h>
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index c3ab9a6..f6c9632 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -55,7 +55,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/gfp.h>
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 8ea6e6a..f10631b 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -36,7 +36,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 523524b..73510d0 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -29,7 +29,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index ea3b3dc..39814bb 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/gfp.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/err.h>
#include <linux/io.h>
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index d74def8..ba5f271 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -40,7 +40,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 97f4acb..3638887 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -35,7 +35,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 3b0dd57..9a6bd4c 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -31,7 +31,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index d67fc35..e476e7b 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 1ad2f62..b513428 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -33,7 +33,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index dc4f701..c630fa8 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -39,7 +39,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 9947010..6cd0312 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -82,7 +82,6 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 6d64891..08f98c3 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -28,7 +28,6 @@
#include <linux/module.h>
#include <linux/gfp.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 87f056e..f72e842 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 44f304b..29e847a 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -37,7 +37,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/media/common/btcx-risc.c | 1 -
drivers/media/common/cx2341x.c | 1 -
drivers/media/common/siano/smsdvb-debugfs.c | 1 -
drivers/media/common/tveeprom.c | 1 -
drivers/media/dvb-frontends/au8522_dig.c | 1 -
drivers/media/dvb-frontends/au8522_priv.h | 1 -
drivers/media/dvb-frontends/bcm3510.c | 1 -
drivers/media/dvb-frontends/cx22700.c | 1 -
drivers/media/dvb-frontends/cx22702.c | 1 -
drivers/media/dvb-frontends/cx24110.c | 1 -
drivers/media/dvb-frontends/cx24113.c | 1 -
drivers/media/dvb-frontends/cx24116.c | 1 -
drivers/media/dvb-frontends/cx24117.c | 1 -
drivers/media/dvb-frontends/cx24123.c | 1 -
drivers/media/dvb-frontends/dib3000mb.c | 1 -
drivers/media/dvb-frontends/drxd_hard.c | 1 -
drivers/media/dvb-frontends/drxk_hard.c | 1 -
drivers/media/dvb-frontends/ds3000.c | 1 -
drivers/media/dvb-frontends/dvb_dummy_fe.c | 1 -
drivers/media/dvb-frontends/isl6405.c | 1 -
drivers/media/dvb-frontends/isl6421.c | 1 -
drivers/media/dvb-frontends/isl6423.c | 1 -
drivers/media/dvb-frontends/it913x-fe.c | 1 -
drivers/media/dvb-frontends/l64781.c | 1 -
drivers/media/dvb-frontends/lgdt330x.c | 1 -
drivers/media/dvb-frontends/lgs8gl5.c | 1 -
drivers/media/dvb-frontends/lnbp21.c | 1 -
drivers/media/dvb-frontends/lnbp22.c | 1 -
drivers/media/dvb-frontends/m88rs2000.c | 1 -
drivers/media/dvb-frontends/mb86a16.c | 1 -
drivers/media/dvb-frontends/mt312.c | 1 -
drivers/media/dvb-frontends/mt352.c | 1 -
drivers/media/dvb-frontends/nxt200x.c | 1 -
drivers/media/dvb-frontends/nxt6000.c | 1 -
drivers/media/dvb-frontends/or51132.c | 1 -
drivers/media/dvb-frontends/s5h1409.c | 1 -
drivers/media/dvb-frontends/s5h1411.c | 1 -
drivers/media/dvb-frontends/s5h1420.c | 1 -
drivers/media/dvb-frontends/s5h1432.c | 1 -
drivers/media/dvb-frontends/si21xx.c | 1 -
drivers/media/dvb-frontends/sp8870.c | 1 -
drivers/media/dvb-frontends/sp887x.c | 1 -
drivers/media/dvb-frontends/stb0899_drv.c | 1 -
drivers/media/dvb-frontends/stb6100.c | 1 -
drivers/media/dvb-frontends/stv0288.c | 1 -
drivers/media/dvb-frontends/stv0297.c | 1 -
drivers/media/dvb-frontends/stv0299.c | 1 -
drivers/media/dvb-frontends/stv090x.c | 1 -
drivers/media/dvb-frontends/stv6110x.c | 1 -
drivers/media/dvb-frontends/tda10021.c | 1 -
drivers/media/dvb-frontends/tda10023.c | 1 -
drivers/media/dvb-frontends/tda10048.c | 1 -
drivers/media/dvb-frontends/tda1004x.c | 1 -
drivers/media/dvb-frontends/tda10086.c | 1 -
drivers/media/dvb-frontends/tda18271c2dd.c | 1 -
drivers/media/dvb-frontends/tda665x.c | 1 -
drivers/media/dvb-frontends/tda8083.c | 1 -
drivers/media/dvb-frontends/tda8261.c | 1 -
drivers/media/dvb-frontends/ves1820.c | 1 -
drivers/media/dvb-frontends/ves1x93.c | 1 -
drivers/media/dvb-frontends/zl10039.c | 1 -
drivers/media/dvb-frontends/zl10353.c | 1 -
drivers/media/i2c/adv7180.c | 1 -
drivers/media/i2c/adv7183.c | 1 -
drivers/media/i2c/adv7343.c | 1 -
drivers/media/i2c/adv7393.c | 1 -
drivers/media/i2c/ak881x.c | 1 -
drivers/media/i2c/ir-kbd-i2c.c | 1 -
drivers/media/i2c/ks0127.c | 1 -
drivers/media/i2c/ml86v7667.c | 1 -
drivers/media/i2c/mt9m032.c | 1 -
drivers/media/i2c/ov7640.c | 1 -
drivers/media/i2c/ov7670.c | 1 -
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 1 -
drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 -
drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
drivers/media/i2c/saa6588.c | 1 -
drivers/media/i2c/saa6752hs.c | 1 -
drivers/media/i2c/saa7110.c | 1 -
drivers/media/i2c/saa7191.c | 1 -
drivers/media/i2c/soc_camera/mt9t112.c | 1 -
drivers/media/i2c/soc_camera/ov2640.c | 1 -
drivers/media/i2c/soc_camera/ov772x.c | 1 -
drivers/media/i2c/soc_camera/ov9640.c | 1 -
drivers/media/i2c/soc_camera/ov9740.c | 1 -
drivers/media/i2c/soc_camera/tw9910.c | 1 -
drivers/media/i2c/sony-btf-mpx.c | 1 -
drivers/media/i2c/tda7432.c | 1 -
drivers/media/i2c/tvaudio.c | 1 -
drivers/media/i2c/tw2804.c | 1 -
drivers/media/i2c/tw9903.c | 1 -
drivers/media/i2c/tw9906.c | 1 -
drivers/media/i2c/uda1342.c | 1 -
drivers/media/i2c/vpx3220.c | 1 -
drivers/media/i2c/vs6624.c | 1 -
drivers/media/pci/bt8xx/bttv-gpio.c | 1 -
drivers/media/pci/bt8xx/bttv-i2c.c | 1 -
drivers/media/pci/bt8xx/bttv-if.c | 1 -
drivers/media/pci/bt8xx/bttv-input.c | 1 -
drivers/media/pci/bt8xx/bttv-risc.c | 1 -
drivers/media/pci/bt8xx/dst.c | 1 -
drivers/media/pci/bt8xx/dst_ca.c | 1 -
drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 -
drivers/media/pci/cx18/cx18-driver.h | 1 -
drivers/media/pci/cx23885/cx23885-417.c | 1 -
drivers/media/pci/cx23885/cx23885-alsa.c | 1 -
drivers/media/pci/cx23885/cx23885-cards.c | 1 -
drivers/media/pci/cx23885/cx23885-dvb.c | 1 -
drivers/media/pci/cx23885/cx23885-i2c.c | 1 -
drivers/media/pci/cx23885/cx23885-vbi.c | 1 -
drivers/media/pci/cx23885/cx23885-video.c | 1 -
drivers/media/pci/cx25821/cx25821-alsa.c | 1 -
drivers/media/pci/cx25821/cx25821-audio-upstream.c | 1 -
drivers/media/pci/cx25821/cx25821-cards.c | 1 -
drivers/media/pci/cx25821/cx25821-video-upstream.c | 1 -
drivers/media/pci/cx25821/cx25821-video.h | 1 -
drivers/media/pci/cx88/cx88-alsa.c | 1 -
drivers/media/pci/cx88/cx88-cards.c | 1 -
drivers/media/pci/cx88/cx88-core.c | 1 -
drivers/media/pci/cx88/cx88-i2c.c | 1 -
drivers/media/pci/cx88/cx88-input.c | 1 -
drivers/media/pci/cx88/cx88-mpeg.c | 1 -
drivers/media/pci/cx88/cx88-tvaudio.c | 1 -
drivers/media/pci/cx88/cx88-vbi.c | 1 -
drivers/media/pci/cx88/cx88-video.c | 1 -
drivers/media/pci/cx88/cx88-vp3054-i2c.c | 1 -
drivers/media/pci/dm1105/dm1105.c | 1 -
drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 1 -
drivers/media/pci/ivtv/ivtv-driver.h | 1 -
drivers/media/pci/mantis/mantis_pci.c | 1 -
drivers/media/pci/ngene/ngene-core.c | 1 -
drivers/media/pci/ngene/ngene-dvb.c | 1 -
drivers/media/pci/ngene/ngene-i2c.c | 1 -
drivers/media/pci/pluto2/pluto2.c | 1 -
drivers/media/pci/saa7134/saa7134-alsa.c | 1 -
drivers/media/pci/saa7134/saa7134-cards.c | 1 -
drivers/media/pci/saa7134/saa7134-i2c.c | 1 -
drivers/media/pci/saa7134/saa7134-input.c | 1 -
drivers/media/pci/saa7134/saa7134-ts.c | 1 -
drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 -
drivers/media/pci/saa7134/saa7134-vbi.c | 1 -
drivers/media/pci/saa7134/saa7134-video.c | 1 -
drivers/media/pci/saa7164/saa7164-cards.c | 1 -
drivers/media/pci/saa7164/saa7164-i2c.c | 1 -
drivers/media/pci/ttpci/av7110_ir.c | 1 -
drivers/media/pci/ttpci/ttpci-eeprom.c | 1 -
drivers/media/pci/zoran/zoran_driver.c | 1 -
drivers/media/platform/blackfin/bfin_capture.c | 1 -
drivers/media/platform/davinci/vpbe.c | 1 -
drivers/media/platform/davinci/vpbe_display.c | 1 -
drivers/media/platform/davinci/vpbe_venc.c | 1 -
drivers/media/platform/davinci/vpfe_capture.c | 1 -
drivers/media/platform/fsl-viu.c | 1 -
drivers/media/platform/indycam.c | 1 -
drivers/media/platform/sh_vou.c | 1 -
drivers/media/platform/soc_camera/atmel-isi.c | 1 -
drivers/media/platform/soc_camera/mx2_camera.c | 1 -
drivers/media/platform/soc_camera/mx3_camera.c | 1 -
drivers/media/platform/soc_camera/pxa_camera.c | 1 -
drivers/media/platform/soc_camera/soc_camera.c | 1 -
drivers/media/platform/soc_camera/soc_camera_platform.c | 1 -
drivers/media/radio/dsbr100.c | 1 -
drivers/media/radio/radio-isa.c | 1 -
drivers/media/radio/radio-ma901.c | 1 -
drivers/media/radio/radio-maxiradio.c | 1 -
drivers/media/radio/radio-mr800.c | 1 -
drivers/media/radio/radio-raremono.c | 1 -
drivers/media/radio/radio-shark.c | 1 -
drivers/media/radio/radio-shark2.c | 1 -
drivers/media/radio/radio-tea5764.c | 1 -
drivers/media/radio/radio-tea5777.c | 1 -
drivers/media/radio/saa7706h.c | 1 -
drivers/media/radio/si470x/radio-si470x.h | 1 -
drivers/media/radio/si4713/radio-platform-si4713.c | 1 -
drivers/media/radio/si4713/radio-usb-si4713.c | 1 -
drivers/media/radio/tef6862.c | 1 -
drivers/media/rc/ati_remote.c | 1 -
drivers/media/rc/gpio-ir-recv.c | 1 -
drivers/media/rc/imon.c | 1 -
drivers/media/tuners/mt2063.c | 1 -
drivers/media/tuners/mxl5005s.c | 1 -
drivers/media/tuners/tda9887.c | 1 -
drivers/media/usb/au0828/au0828-dvb.c | 1 -
drivers/media/usb/au0828/au0828-i2c.c | 1 -
drivers/media/usb/au0828/au0828-vbi.c | 1 -
drivers/media/usb/au0828/au0828-video.c | 1 -
drivers/media/usb/cx231xx/cx231xx-417.c | 1 -
drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 -
drivers/media/usb/cx231xx/cx231xx-cards.c | 1 -
drivers/media/usb/cx231xx/cx231xx-core.c | 1 -
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 1 -
drivers/media/usb/cx231xx/cx231xx-vbi.c | 1 -
drivers/media/usb/cx231xx/cx231xx-video.c | 1 -
drivers/media/usb/dvb-usb/friio-fe.c | 1 -
drivers/media/usb/em28xx/em28xx-cards.c | 1 -
drivers/media/usb/em28xx/em28xx-core.c | 1 -
drivers/media/usb/em28xx/em28xx-vbi.c | 1 -
drivers/media/usb/em28xx/em28xx-video.c | 1 -
drivers/media/usb/hdpvr/hdpvr-control.c | 1 -
drivers/media/usb/hdpvr/hdpvr-core.c | 1 -
drivers/media/usb/hdpvr/hdpvr-video.c | 1 -
drivers/media/usb/pwc/pwc-if.c | 1 -
drivers/media/usb/pwc/pwc-v4l.c | 1 -
drivers/media/usb/siano/smsusb.c | 1 -
drivers/media/usb/stk1160/stk1160-core.c | 1 -
drivers/media/usb/stkwebcam/stk-webcam.c | 1 -
drivers/media/usb/tlg2300/pd-alsa.c | 1 -
drivers/media/usb/tlg2300/pd-radio.c | 1 -
drivers/media/usb/tm6000/tm6000-cards.c | 1 -
drivers/media/usb/tm6000/tm6000-input.c | 1 -
drivers/media/usb/tm6000/tm6000-video.c | 1 -
drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 1 -
drivers/media/usb/ttusb-dec/ttusb_dec.c | 1 -
drivers/media/usb/usbtv/usbtv.c | 1 -
drivers/media/usb/usbvision/usbvision-core.c | 1 -
drivers/media/usb/usbvision/usbvision-i2c.c | 1 -
drivers/media/usb/zr364xx/zr364xx.c | 1 -
drivers/media/v4l2-core/tuner-core.c | 1 -
drivers/media/v4l2-core/videobuf-core.c | 1 -
drivers/media/v4l2-core/videobuf-dma-contig.c | 1 -
drivers/media/v4l2-core/videobuf-dma-sg.c | 1 -
drivers/media/v4l2-core/videobuf-dvb.c | 1 -
drivers/media/v4l2-core/videobuf-vmalloc.c | 1 -
223 files changed, 223 deletions(-)
diff --git a/drivers/media/common/btcx-risc.c b/drivers/media/common/btcx-risc.c
index ac1b268..c39610e 100644
--- a/drivers/media/common/btcx-risc.c
+++ b/drivers/media/common/btcx-risc.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c
index 103ef6b..7639f5a 100644
--- a/drivers/media/common/cx2341x.c
+++ b/drivers/media/common/cx2341x.c
@@ -22,7 +22,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c
index 0bb4430..88fc961 100644
--- a/drivers/media/common/siano/smsdvb-debugfs.c
+++ b/drivers/media/common/siano/smsdvb-debugfs.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/debugfs.h>
#include <linux/spinlock.h>
#include <linux/usb.h>
diff --git a/drivers/media/common/tveeprom.c b/drivers/media/common/tveeprom.c
index c7dace6..7e94981 100644
--- a/drivers/media/common/tveeprom.c
+++ b/drivers/media/common/tveeprom.c
@@ -32,7 +32,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/videodev2.h>
#include <linux/i2c.h>
diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
index a68974f..9b9c71c 100644
--- a/drivers/media/dvb-frontends/au8522_dig.c
+++ b/drivers/media/dvb-frontends/au8522_dig.c
@@ -20,7 +20,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/delay.h>
diff --git a/drivers/media/dvb-frontends/au8522_priv.h b/drivers/media/dvb-frontends/au8522_priv.h
index aa0f16d..190d447 100644
--- a/drivers/media/dvb-frontends/au8522_priv.h
+++ b/drivers/media/dvb-frontends/au8522_priv.h
@@ -22,7 +22,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index 39a29dd..1ebb46b 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -31,7 +31,6 @@
* Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/firmware.h>
diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
index 3d399d9..1f4031a 100644
--- a/drivers/media/dvb-frontends/cx22700.c
+++ b/drivers/media/dvb-frontends/cx22700.c
@@ -21,7 +21,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
index edc8eaf..7d6ce32 100644
--- a/drivers/media/dvb-frontends/cx22702.c
+++ b/drivers/media/dvb-frontends/cx22702.c
@@ -26,7 +26,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index 95b981c..72f898e 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -25,7 +25,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include "dvb_frontend.h"
#include "cx24110.h"
diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
index 3883c3b..b7190a3 100644
--- a/drivers/media/dvb-frontends/cx24113.c
+++ b/drivers/media/dvb-frontends/cx24113.c
@@ -24,7 +24,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include "dvb_frontend.h"
#include "cx24113.h"
diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
index 2916d7c..4c4c3a0 100644
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
@@ -38,7 +38,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/firmware.h>
#include "dvb_frontend.h"
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index 68f768a..c61e113 100644
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/firmware.h>
#include "tuner-i2c.h"
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index 72fb583..9c56f4a 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -25,7 +25,6 @@
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <asm/div64.h>
#include "dvb_frontend.h"
diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
index af91e0c..1b0eefc 100644
--- a/drivers/media/dvb-frontends/dib3000mb.c
+++ b/drivers/media/dvb-frontends/dib3000mb.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index 959ae36..d400579 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index bf29a3f..5fc7ad1 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -26,7 +26,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index 1e344b0..97891f3 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/firmware.h>
#include "dvb_frontend.h"
diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index d5acc30..14cc1fe 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
index 0c642a5..21c365c 100644
--- a/drivers/media/dvb-frontends/isl6405.c
+++ b/drivers/media/dvb-frontends/isl6405.c
@@ -26,7 +26,6 @@
*/
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
index c77002f..0e3892f 100644
--- a/drivers/media/dvb-frontends/isl6421.c
+++ b/drivers/media/dvb-frontends/isl6421.c
@@ -26,7 +26,6 @@
*/
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
index dca5beb..abe1f40 100644
--- a/drivers/media/dvb-frontends/isl6423.c
+++ b/drivers/media/dvb-frontends/isl6423.c
@@ -20,7 +20,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/it913x-fe.c b/drivers/media/dvb-frontends/it913x-fe.c
index 6e1c6eb..3a7724f 100644
--- a/drivers/media/dvb-frontends/it913x-fe.c
+++ b/drivers/media/dvb-frontends/it913x-fe.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/types.h>
diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
index ddf866c..ecbcc30 100644
--- a/drivers/media/dvb-frontends/l64781.c
+++ b/drivers/media/dvb-frontends/l64781.c
@@ -20,7 +20,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index e046622..987275b 100644
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -35,7 +35,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
index 416cce3..72152bd 100644
--- a/drivers/media/dvb-frontends/lgs8gl5.c
+++ b/drivers/media/dvb-frontends/lgs8gl5.c
@@ -21,7 +21,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
index f3ba7b5..e4ebb83 100644
--- a/drivers/media/dvb-frontends/lnbp21.c
+++ b/drivers/media/dvb-frontends/lnbp21.c
@@ -26,7 +26,6 @@
*/
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
index c463da7..e3602f8 100644
--- a/drivers/media/dvb-frontends/lnbp22.c
+++ b/drivers/media/dvb-frontends/lnbp22.c
@@ -26,7 +26,6 @@
*/
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
index b235146..4a2893a 100644
--- a/drivers/media/dvb-frontends/m88rs2000.c
+++ b/drivers/media/dvb-frontends/m88rs2000.c
@@ -22,7 +22,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/jiffies.h>
diff --git a/drivers/media/dvb-frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
index 9ae40ab..d02662a 100644
--- a/drivers/media/dvb-frontends/mb86a16.c
+++ b/drivers/media/dvb-frontends/mb86a16.c
@@ -18,7 +18,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
index a74ac0d..34d1410 100644
--- a/drivers/media/dvb-frontends/mt312.c
+++ b/drivers/media/dvb-frontends/mt312.c
@@ -26,7 +26,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
index 2c3b50e..baf231c 100644
--- a/drivers/media/dvb-frontends/mt352.c
+++ b/drivers/media/dvb-frontends/mt352.c
@@ -32,7 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
index 4bf0575..c63b03a 100644
--- a/drivers/media/dvb-frontends/nxt200x.c
+++ b/drivers/media/dvb-frontends/nxt200x.c
@@ -47,7 +47,6 @@
#define CRC_CCIT_MASK 0x1021
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
index 90ae6c7..0cc0bc6 100644
--- a/drivers/media/dvb-frontends/nxt6000.c
+++ b/drivers/media/dvb-frontends/nxt6000.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
index 5ef9218..236fa19 100644
--- a/drivers/media/dvb-frontends/or51132.c
+++ b/drivers/media/dvb-frontends/or51132.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
index f71b062..4ade31b 100644
--- a/drivers/media/dvb-frontends/s5h1409.c
+++ b/drivers/media/dvb-frontends/s5h1409.c
@@ -20,7 +20,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
index 6cc4b7a..3839886 100644
--- a/drivers/media/dvb-frontends/s5h1411.c
+++ b/drivers/media/dvb-frontends/s5h1411.c
@@ -20,7 +20,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
index 93eeaf7..7814c13 100644
--- a/drivers/media/dvb-frontends/s5h1420.c
+++ b/drivers/media/dvb-frontends/s5h1420.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
index 6ec16a2..f3135b8 100644
--- a/drivers/media/dvb-frontends/s5h1432.c
+++ b/drivers/media/dvb-frontends/s5h1432.c
@@ -19,7 +19,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
index 73b47cc..b21cb00 100644
--- a/drivers/media/dvb-frontends/si21xx.c
+++ b/drivers/media/dvb-frontends/si21xx.c
@@ -8,7 +8,6 @@
* (at your option) any later version.
*
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
index 2aa8ef7..f5fc713 100644
--- a/drivers/media/dvb-frontends/sp8870.c
+++ b/drivers/media/dvb-frontends/sp8870.c
@@ -27,7 +27,6 @@
*/
#define SP8870_DEFAULT_FIRMWARE "dvb-fe-sp8870.fw"
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/firmware.h>
diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
index 1bb81b5..f326955 100644
--- a/drivers/media/dvb-frontends/sp887x.c
+++ b/drivers/media/dvb-frontends/sp887x.c
@@ -10,7 +10,6 @@
*/
#define SP887X_DEFAULT_FIRMWARE "dvb-fe-sp887x.fw"
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/firmware.h>
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 07cd5ea..7fabfbd 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index cea175d..4265e40 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
index 632b251..8731001 100644
--- a/drivers/media/dvb-frontends/stv0288.c
+++ b/drivers/media/dvb-frontends/stv0288.c
@@ -25,7 +25,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
index d40f226..18903e5 100644
--- a/drivers/media/dvb-frontends/stv0297.c
+++ b/drivers/media/dvb-frontends/stv0297.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
index b57ecf4..baccefd 100644
--- a/drivers/media/dvb-frontends/stv0299.c
+++ b/drivers/media/dvb-frontends/stv0299.c
@@ -42,7 +42,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 23e872f..9160cd1 100644
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index e66154e..9e1078e 100644
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -20,7 +20,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
index 1bff7f4..3558a54 100644
--- a/drivers/media/dvb-frontends/tda10021.c
+++ b/drivers/media/dvb-frontends/tda10021.c
@@ -23,7 +23,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
index ca1e0d5..f8193a5 100644
--- a/drivers/media/dvb-frontends/tda10023.c
+++ b/drivers/media/dvb-frontends/tda10023.c
@@ -27,7 +27,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
index 71fb632..80adcb3 100644
--- a/drivers/media/dvb-frontends/tda10048.c
+++ b/drivers/media/dvb-frontends/tda10048.c
@@ -20,7 +20,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
index a2631be..d99a5dd 100644
--- a/drivers/media/dvb-frontends/tda1004x.c
+++ b/drivers/media/dvb-frontends/tda1004x.c
@@ -29,7 +29,6 @@
#define TDA10045_DEFAULT_FIRMWARE "dvb-fe-tda10045.fw"
#define TDA10046_DEFAULT_FIRMWARE "dvb-fe-tda10046.fw"
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/jiffies.h>
diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
index fcfe2e0..5d8ee20 100644
--- a/drivers/media/dvb-frontends/tda10086.c
+++ b/drivers/media/dvb-frontends/tda10086.c
@@ -20,7 +20,6 @@
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/jiffies.h>
diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
index 2c54586..2653c06 100644
--- a/drivers/media/dvb-frontends/tda18271c2dd.c
+++ b/drivers/media/dvb-frontends/tda18271c2dd.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
index 63cc123..bf9f94b 100644
--- a/drivers/media/dvb-frontends/tda665x.c
+++ b/drivers/media/dvb-frontends/tda665x.c
@@ -17,7 +17,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index 69e62f4..c5c1f59 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -24,7 +24,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
index 19c4888..78ee1df 100644
--- a/drivers/media/dvb-frontends/tda8261.c
+++ b/drivers/media/dvb-frontends/tda8261.c
@@ -18,7 +18,6 @@
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
index bb42b56..53090a5 100644
--- a/drivers/media/dvb-frontends/ves1820.c
+++ b/drivers/media/dvb-frontends/ves1820.c
@@ -20,7 +20,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
index 9c17eac..0cbaf19 100644
--- a/drivers/media/dvb-frontends/ves1x93.c
+++ b/drivers/media/dvb-frontends/ves1x93.c
@@ -25,7 +25,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
index 91b6b2e..575ac33 100644
--- a/drivers/media/dvb-frontends/zl10039.c
+++ b/drivers/media/dvb-frontends/zl10039.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/dvb/frontend.h>
diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
index 82946cd..92cc0c3 100644
--- a/drivers/media/dvb-frontends/zl10353.c
+++ b/drivers/media/dvb-frontends/zl10353.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index d7d99f1..45db360 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -19,7 +19,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index d45e0e3..c319584 100644
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -21,7 +21,6 @@
#include <linux/errno.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/types.h>
diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
index d4e15a6..a3e207e 100644
--- a/drivers/media/i2c/adv7343.c
+++ b/drivers/media/i2c/adv7343.c
@@ -16,7 +16,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/media/i2c/adv7393.c b/drivers/media/i2c/adv7393.c
index 558f191..a519aa5 100644
--- a/drivers/media/i2c/adv7393.c
+++ b/drivers/media/i2c/adv7393.c
@@ -21,7 +21,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
index c14e667..b8f395e 100644
--- a/drivers/media/i2c/ak881x.c
+++ b/drivers/media/i2c/ak881x.c
@@ -9,7 +9,6 @@
*/
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index 99ee456..f74e26b 100644
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -36,7 +36,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
index c3e94ae..830c84f 100644
--- a/drivers/media/i2c/ks0127.c
+++ b/drivers/media/i2c/ks0127.c
@@ -33,7 +33,6 @@
* V1.1 Gerard v.d. Horst Added some debugoutput, reset the video-standard
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
index a9110d8..5775a6e 100644
--- a/drivers/media/i2c/ml86v7667.c
+++ b/drivers/media/i2c/ml86v7667.c
@@ -11,7 +11,6 @@
* option) any later version.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c
index 85ec3ba..d20568b 100644
--- a/drivers/media/i2c/mt9m032.c
+++ b/drivers/media/i2c/mt9m032.c
@@ -22,7 +22,6 @@
#include <linux/delay.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/math64.h>
#include <linux/module.h>
diff --git a/drivers/media/i2c/ov7640.c b/drivers/media/i2c/ov7640.c
index faa64ba..0171198 100644
--- a/drivers/media/i2c/ov7640.c
+++ b/drivers/media/i2c/ov7640.c
@@ -15,7 +15,6 @@
* Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index e8a1ce2..8e45ba2 100644
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -10,7 +10,6 @@
* This file may be distributed under the terms of the GNU General
* Public License, version 2.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2c.h>
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index e7f555c..56a979f 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -20,7 +20,6 @@
#include <linux/firmware.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/media.h>
#include <linux/module.h>
#include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
index 8001cde..e6a23a1 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
@@ -20,7 +20,6 @@
#include <linux/firmware.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/media.h>
#include <linux/module.h>
#include <linux/regulator/consumer.h>
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
index 8079e26..09b3890 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
@@ -17,7 +17,6 @@
#include <linux/sizes.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/media.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index 2960b5a..18c42ca 100644
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -24,7 +24,6 @@
#include <linux/i2c.h>
#include <linux/types.h>
#include <linux/videodev2.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/poll.h>
diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 8272c0b..234ea56 100644
--- a/drivers/media/i2c/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
@@ -33,7 +33,6 @@
#include <linux/i2c.h>
#include <linux/types.h>
#include <linux/videodev2.h>
-#include <linux/init.h>
#include <linux/crc32.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
index ac43e92..88d6cb9 100644
--- a/drivers/media/i2c/saa7110.c
+++ b/drivers/media/i2c/saa7110.c
@@ -26,7 +26,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/saa7191.c b/drivers/media/i2c/saa7191.c
index 606a4ba..c129152 100644
--- a/drivers/media/i2c/saa7191.c
+++ b/drivers/media/i2c/saa7191.c
@@ -12,7 +12,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/module.h>
diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index 46f431a..00e014d 100644
--- a/drivers/media/i2c/soc_camera/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
@@ -19,7 +19,6 @@
#include <linux/delay.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/v4l2-mediabus.h>
diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 6c6b1c3..5f2210b 100644
--- a/drivers/media/i2c/soc_camera/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
@@ -13,7 +13,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index 7f2b3c8..7bcbaac 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -15,7 +15,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/i2c.h>
diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index bc74224..28aac74 100644
--- a/drivers/media/i2c/soc_camera/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
@@ -19,7 +19,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index ea76863..3dbd1ba 100644
--- a/drivers/media/i2c/soc_camera/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
index ab54628..f35882b 100644
--- a/drivers/media/i2c/soc_camera/tw9910.c
+++ b/drivers/media/i2c/soc_camera/tw9910.c
@@ -16,7 +16,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/sony-btf-mpx.c b/drivers/media/i2c/sony-btf-mpx.c
index 32d8232..c2eede1 100644
--- a/drivers/media/i2c/sony-btf-mpx.c
+++ b/drivers/media/i2c/sony-btf-mpx.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/tuner.h>
diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
index 72af644..ae5749d 100644
--- a/drivers/media/i2c/tda7432.c
+++ b/drivers/media/i2c/tda7432.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index d76c53a8..b17b484 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -32,7 +32,6 @@
#include <linux/slab.h>
#include <linux/videodev2.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
index f58607d..840067b 100644
--- a/drivers/media/i2c/tw2804.c
+++ b/drivers/media/i2c/tw2804.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <linux/ioctl.h>
diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c
index 285b759..8dde4c7 100644
--- a/drivers/media/i2c/tw9903.c
+++ b/drivers/media/i2c/tw9903.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <linux/ioctl.h>
diff --git a/drivers/media/i2c/tw9906.c b/drivers/media/i2c/tw9906.c
index f6bef25..5ec7a8d 100644
--- a/drivers/media/i2c/tw9906.c
+++ b/drivers/media/i2c/tw9906.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <linux/ioctl.h>
diff --git a/drivers/media/i2c/uda1342.c b/drivers/media/i2c/uda1342.c
index 081786d..2c20ac22 100644
--- a/drivers/media/i2c/uda1342.c
+++ b/drivers/media/i2c/uda1342.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index ece90df..32ceaf4 100644
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -19,7 +19,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/slab.h>
diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
index 23f4f65..f8a80db 100644
--- a/drivers/media/i2c/vs6624.c
+++ b/drivers/media/i2c/vs6624.c
@@ -21,7 +21,6 @@
#include <linux/errno.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/types.h>
diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
index 922e823..2cc95b1 100644
--- a/drivers/media/pci/bt8xx/bttv-gpio.c
+++ b/drivers/media/pci/bt8xx/bttv-gpio.c
@@ -29,7 +29,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/slab.h>
diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
index d43911d..2d5c451 100644
--- a/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/drivers/media/pci/bt8xx/bttv-i2c.c
@@ -30,7 +30,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include "bttvp.h"
diff --git a/drivers/media/pci/bt8xx/bttv-if.c b/drivers/media/pci/bt8xx/bttv-if.c
index a6a540d..075eb78 100644
--- a/drivers/media/pci/bt8xx/bttv-if.c
+++ b/drivers/media/pci/bt8xx/bttv-if.c
@@ -27,7 +27,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index f368213..1f17971 100644
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -21,7 +21,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/input.h>
diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
index 82cc47d..bcea329 100644
--- a/drivers/media/pci/bt8xx/bttv-risc.c
+++ b/drivers/media/pci/bt8xx/bttv-risc.c
@@ -27,7 +27,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
index 430b3eb..bbc901c 100644
--- a/drivers/media/pci/bt8xx/dst.c
+++ b/drivers/media/pci/bt8xx/dst.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
index 0e788fc..4e36cf6 100644
--- a/drivers/media/pci/bt8xx/dst_ca.c
+++ b/drivers/media/pci/bt8xx/dst_ca.c
@@ -21,7 +21,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/string.h>
#include <linux/dvb/ca.h>
diff --git a/drivers/media/pci/cx18/cx18-alsa-pcm.c b/drivers/media/pci/cx18/cx18-alsa-pcm.c
index 180077c..e65616d 100644
--- a/drivers/media/pci/cx18/cx18-alsa-pcm.c
+++ b/drivers/media/pci/cx18/cx18-alsa-pcm.c
@@ -23,7 +23,6 @@
* 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h
index 57f4688..57ef0d8 100644
--- a/drivers/media/pci/cx18/cx18-driver.h
+++ b/drivers/media/pci/cx18/cx18-driver.h
@@ -27,7 +27,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/fs.h>
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index 95666ee..47313cf 100644
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
index c6c9bd5..771311a 100644
--- a/drivers/media/pci/cx23885/cx23885-alsa.c
+++ b/drivers/media/pci/cx23885/cx23885-alsa.c
@@ -22,7 +22,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 79f20c8..0a2cd9f 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 0549205..f1a563f 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -20,7 +20,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/fs.h>
#include <linux/kthread.h>
diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c
index 4887314..6d6345e 100644
--- a/drivers/media/pci/cx23885/cx23885-i2c.c
+++ b/drivers/media/pci/cx23885/cx23885-i2c.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/pci/cx23885/cx23885-vbi.c
index a1154f0..332b40b 100644
--- a/drivers/media/pci/cx23885/cx23885-vbi.c
+++ b/drivers/media/pci/cx23885/cx23885-vbi.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include "cx23885.h"
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 7891f34..68bfee8 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
index b1e08c3..5f6b88b 100644
--- a/drivers/media/pci/cx25821/cx25821-alsa.c
+++ b/drivers/media/pci/cx25821/cx25821-alsa.c
@@ -23,7 +23,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 68dbc2d..0c7bb8c 100644
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -28,7 +28,6 @@
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/syscalls.h>
#include <linux/file.h>
diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
index f2ebc98..c35c71e 100644
--- a/drivers/media/pci/cx25821/cx25821-cards.c
+++ b/drivers/media/pci/cx25821/cx25821-cards.c
@@ -23,7 +23,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 1f43be0..db76689 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -27,7 +27,6 @@
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/pci/cx25821/cx25821-video.h
index ab63b38..79216c6 100644
--- a/drivers/media/pci/cx25821/cx25821-video.h
+++ b/drivers/media/pci/cx25821/cx25821-video.h
@@ -24,7 +24,6 @@
#ifndef CX25821_VIDEO_H_
#define CX25821_VIDEO_H_
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index d014206e..218f64a 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -25,7 +25,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index e18a7ac..7584afc 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index ad59dc9..bf04477 100644
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -25,7 +25,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/cx88/cx88-i2c.c b/drivers/media/pci/cx88/cx88-i2c.c
index cf2d696..4f80bb5 100644
--- a/drivers/media/pci/cx88/cx88-i2c.c
+++ b/drivers/media/pci/cx88/cx88-i2c.c
@@ -28,7 +28,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <asm/io.h>
diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index f29e18c..9de7287 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -22,7 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/hrtimer.h>
#include <linux/pci.h>
#include <linux/slab.h>
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 74b7b86..fb8e78f 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c
index 424fd97..43c53b5 100644
--- a/drivers/media/pci/cx88/cx88-tvaudio.c
+++ b/drivers/media/pci/cx88/cx88-tvaudio.c
@@ -46,7 +46,6 @@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/kthread.h>
diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c
index f8f8389..2ea1190 100644
--- a/drivers/media/pci/cx88/cx88-vbi.c
+++ b/drivers/media/pci/cx88/cx88-vbi.c
@@ -2,7 +2,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include "cx88.h"
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index ed8cb90..7401bcb 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -25,7 +25,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kmod.h>
diff --git a/drivers/media/pci/cx88/cx88-vp3054-i2c.c b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
index deede6e..742bfca 100644
--- a/drivers/media/pci/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <asm/io.h>
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index e60ac35..419194f 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -21,7 +21,6 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index e1863db..9fd932b 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -23,7 +23,6 @@
* 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index bc309f42c..408343a 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -37,7 +37,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/fs.h>
diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
index 9e89e04..fbf0182 100644
--- a/drivers/media/pci/mantis/mantis_pci.c
+++ b/drivers/media/pci/mantis/mantis_pci.c
@@ -25,7 +25,6 @@
#include <asm/page.h>
#include <linux/kmod.h>
#include <linux/vmalloc.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/pci.h>
diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
index 970e833..1eec301 100644
--- a/drivers/media/pci/ngene/ngene-core.c
+++ b/drivers/media/pci/ngene/ngene-core.c
@@ -28,7 +28,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/poll.h>
#include <linux/io.h>
diff --git a/drivers/media/pci/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c
index fcb16a6..e94b4d5 100644
--- a/drivers/media/pci/ngene/ngene-dvb.c
+++ b/drivers/media/pci/ngene/ngene-dvb.c
@@ -28,7 +28,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/poll.h>
diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
index d28554f..434caf0 100644
--- a/drivers/media/pci/ngene/ngene-i2c.c
+++ b/drivers/media/pci/ngene/ngene-i2c.c
@@ -29,7 +29,6 @@
/* FIXME - some of these can probably be removed */
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/poll.h>
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
index 655d6854..8293eb7 100644
--- a/drivers/media/pci/pluto2/pluto2.c
+++ b/drivers/media/pci/pluto2/pluto2.c
@@ -25,7 +25,6 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index dd67c8a..33e22c1 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -16,7 +16,6 @@
*
*/
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/wait.h>
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index d45e7f6..9ae7ca2 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
index c68169d..c71abff 100644
--- a/drivers/media/pci/saa7134/saa7134-i2c.c
+++ b/drivers/media/pci/saa7134/saa7134-i2c.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 6f43126..255a35e 100644
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -19,7 +19,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 2e3f4b4..6957176 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
index 0f34e09..ed532f4 100644
--- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index d4da18d..ce80d7c 100644
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index eb472b5..6d05685 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/saa7164/saa7164-cards.c b/drivers/media/pci/saa7164/saa7164-cards.c
index 5b72da5..4698daa 100644
--- a/drivers/media/pci/saa7164/saa7164-cards.c
+++ b/drivers/media/pci/saa7164/saa7164-cards.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
diff --git a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c
index 4f7e3b4..a9a0c8d 100644
--- a/drivers/media/pci/saa7164/saa7164-i2c.c
+++ b/drivers/media/pci/saa7164/saa7164-i2c.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
index 0e763a7..c77222d 100644
--- a/drivers/media/pci/ttpci/av7110_ir.c
+++ b/drivers/media/pci/ttpci/av7110_ir.c
@@ -23,7 +23,6 @@
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/kernel.h>
diff --git a/drivers/media/pci/ttpci/ttpci-eeprom.c b/drivers/media/pci/ttpci/ttpci-eeprom.c
index 32d4315..862552b 100644
--- a/drivers/media/pci/ttpci/ttpci-eeprom.c
+++ b/drivers/media/pci/ttpci/ttpci-eeprom.c
@@ -32,7 +32,6 @@
*/
#include <asm/errno.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/i2c.h>
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index e7e9840..6c4ab66 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -44,7 +44,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/slab.h>
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index 2819165..119bc0a 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -22,7 +22,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mm.h>
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 33b9660..fb86341 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -15,7 +15,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/fs.h>
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index b02aba4..7d73561 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -11,7 +11,6 @@
* GNU General Public License for more details.
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
index 14a023a..62a4cd3 100644
--- a/drivers/media/platform/davinci/vpbe_venc.c
+++ b/drivers/media/platform/davinci/vpbe_venc.c
@@ -16,7 +16,6 @@
*/
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index d762246..3253714 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -68,7 +68,6 @@
*/
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <media/v4l2-common.h>
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index dbf0ce3..9a6c4c0 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -18,7 +18,6 @@
#include <linux/clk.h>
#include <linux/kernel.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/of_address.h>
diff --git a/drivers/media/platform/indycam.c b/drivers/media/platform/indycam.c
index f1d192b..27c0669 100644
--- a/drivers/media/platform/indycam.c
+++ b/drivers/media/platform/indycam.c
@@ -12,7 +12,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/module.h>
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index e5f1d4c..42c4b90 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -13,7 +13,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 4835173..78240a6 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -15,7 +15,6 @@
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/fs.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index d73abca..ac9af48 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -11,7 +11,6 @@
* (at your option) any later version.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/delay.h>
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index f975b70..0e915db 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/videodev2.h>
#include <linux/platform_device.h>
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index d4df305..f918282 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -10,7 +10,6 @@
* (at your option) any later version.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/delay.h>
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 4b8c024..197fbdf 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -19,7 +19,6 @@
#include <linux/device.h>
#include <linux/err.h>
#include <linux/i2c.h>
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
index ceaddfb..54fbe90 100644
--- a/drivers/media/platform/soc_camera/soc_camera_platform.c
+++ b/drivers/media/platform/soc_camera/soc_camera_platform.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 142c2ee..8cfe33e 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -36,7 +36,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index 6ff3508..c7d2d7a 100644
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -21,7 +21,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
index a85b064..f4ae0f6 100644
--- a/drivers/media/radio/radio-ma901.c
+++ b/drivers/media/radio/radio-ma901.c
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 5236035..996125d 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -34,7 +34,6 @@
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/mutex.h>
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index a360227..4e57439 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -56,7 +56,6 @@
/* kernel includes */
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c
index 7b3bdbb..b27b4d5 100644
--- a/drivers/media/radio/radio-raremono.c
+++ b/drivers/media/radio/radio-raremono.c
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/usb.h>
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 050b3bb..c824eb3 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -25,7 +25,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/leds.h>
#include <linux/module.h>
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index 8654e0d..5318fe3 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -25,7 +25,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/leds.h>
#include <linux/module.h>
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 3ed1f56..e491990 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/init.h> /* Initdata */
#include <linux/videodev2.h> /* kernel radio structs */
#include <linux/i2c.h> /* I2C */
#include <media/v4l2-common.h>
diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
index e245597..18aae8e 100644
--- a/drivers/media/radio/radio-tea5777.c
+++ b/drivers/media/radio/radio-tea5777.c
@@ -24,7 +24,6 @@
*/
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index ec805b0..4f1ce57 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -17,7 +17,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/kernel.h>
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 4b76604..20c3849 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -28,7 +28,6 @@
/* kernel includes */
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/input.h>
diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
index ba4cfc9..139ff48 100644
--- a/drivers/media/radio/si4713/radio-platform-si4713.c
+++ b/drivers/media/radio/si4713/radio-platform-si4713.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c
index f1e640d..03df453 100644
--- a/drivers/media/radio/si4713/radio-usb-si4713.c
+++ b/drivers/media/radio/si4713/radio-usb-si4713.c
@@ -20,7 +20,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/usb.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/mutex.h>
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index a9319a2..e62cad6 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -17,7 +17,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 4d6a63f..fecbed4 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -88,7 +88,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 80c611c..d8481d8 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -11,7 +11,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/gpio.h>
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 822b9f4..639d346 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -29,7 +29,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/tuners/mt2063.c b/drivers/media/tuners/mt2063.c
index 20cca40..b48fc4c 100644
--- a/drivers/media/tuners/mt2063.c
+++ b/drivers/media/tuners/mt2063.c
@@ -19,7 +19,6 @@
* GNU General Public License for more details.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>
diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c
index b473b76..1ebf69c 100644
--- a/drivers/media/tuners/mxl5005s.c
+++ b/drivers/media/tuners/mxl5005s.c
@@ -58,7 +58,6 @@
respective owners.
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
index 9823248..97afd7b 100644
--- a/drivers/media/tuners/tda9887.c
+++ b/drivers/media/tuners/tda9887.c
@@ -2,7 +2,6 @@
#include <linux/kernel.h>
#include <linux/i2c.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c
index 19fe049..5428825 100644
--- a/drivers/media/usb/au0828/au0828-dvb.c
+++ b/drivers/media/usb/au0828/au0828-dvb.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/suspend.h>
#include <media/v4l2-common.h>
diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
index 17ec365..ae18b7b 100644
--- a/drivers/media/usb/au0828/au0828-i2c.c
+++ b/drivers/media/usb/au0828/au0828-i2c.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/drivers/media/usb/au0828/au0828-vbi.c b/drivers/media/usb/au0828/au0828-vbi.c
index 63f5930..4373d3c 100644
--- a/drivers/media/usb/au0828/au0828-vbi.c
+++ b/drivers/media/usb/au0828/au0828-vbi.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include "au0828.h"
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index f615454..0bb104e 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -30,7 +30,6 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/suspend.h>
#include <media/v4l2-common.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index 2f63029..e16a00b 100644
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index 89de00b..43db655 100644
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -22,7 +22,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 2ee03e4..4da2cf3 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -20,7 +20,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
index 4ba3ce0..9040a24 100644
--- a/drivers/media/usb/cx231xx/cx231xx-core.c
+++ b/drivers/media/usb/cx231xx/cx231xx-core.c
@@ -20,7 +20,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
index b3c6190..88206a0 100644
--- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
+++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
@@ -22,7 +22,6 @@
#ifndef _PCB_CONFIG_H_
#define _PCB_CONFIG_H_
-#include <linux/init.h>
#include <linux/module.h>
/***************************************************************************
diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
index c027942..d95aa4f 100644
--- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
@@ -19,7 +19,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 9906261..d91d3e1 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -22,7 +22,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/usb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
index d56f927..4467e37 100644
--- a/drivers/media/usb/dvb-usb/friio-fe.c
+++ b/drivers/media/usb/dvb-usb/friio-fe.c
@@ -10,7 +10,6 @@
*
* see Documentation/dvb/README.dvb-usb for more information
*/
-#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 6efb902..fc68d17 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -23,7 +23,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index b6dc332..382bf19 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -22,7 +22,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/list.h>
#include <linux/module.h>
diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
index db3d655..0cc4759 100644
--- a/drivers/media/usb/em28xx/em28xx-vbi.c
+++ b/drivers/media/usb/em28xx/em28xx-vbi.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/hardirq.h>
-#include <linux/init.h>
#include "em28xx.h"
#include "em28xx-v4l.h"
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index a1dcceb..3d7f909 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -26,7 +26,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/usb/hdpvr/hdpvr-control.c b/drivers/media/usb/hdpvr/hdpvr-control.c
index 6053661..d0f0791 100644
--- a/drivers/media/usb/hdpvr/hdpvr-control.c
+++ b/drivers/media/usb/hdpvr/hdpvr-control.c
@@ -11,7 +11,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/usb.h>
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 2f0c89c..04e471e 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -13,7 +13,6 @@
#include <linux/kernel.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/uaccess.h>
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 0500c417..736aba4 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/kconfig.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/uaccess.h>
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index abf365a..b045645 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -58,7 +58,6 @@
*/
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/poll.h>
diff --git a/drivers/media/usb/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c
index aa7449e..6fcbac8 100644
--- a/drivers/media/usb/pwc/pwc-v4l.c
+++ b/drivers/media/usb/pwc/pwc-v4l.c
@@ -27,7 +27,6 @@
*/
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/poll.h>
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 05bd91a..84303a9 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/usb.h>
#include <linux/firmware.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
index 34a26e0..99b2f30 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -26,7 +26,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index be77482..18bc392 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -23,7 +23,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/tlg2300/pd-alsa.c b/drivers/media/usb/tlg2300/pd-alsa.c
index 3f3e141..e0f51e1 100644
--- a/drivers/media/usb/tlg2300/pd-alsa.c
+++ b/drivers/media/usb/tlg2300/pd-alsa.c
@@ -1,6 +1,5 @@
#include <linux/kernel.h>
#include <linux/usb.h>
-#include <linux/init.h>
#include <linux/sound.h>
#include <linux/spinlock.h>
#include <linux/soundcard.h>
diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
index ea6070b..13a57c2 100644
--- a/drivers/media/usb/tlg2300/pd-radio.c
+++ b/drivers/media/usb/tlg2300/pd-radio.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
index 1ccaadd..88baf37 100644
--- a/drivers/media/usb/tm6000/tm6000-cards.c
+++ b/drivers/media/usb/tm6000/tm6000-cards.c
@@ -17,7 +17,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c
index 8a6bbf1..926ba06 100644
--- a/drivers/media/usb/tm6000/tm6000-input.c
+++ b/drivers/media/usb/tm6000/tm6000-input.c
@@ -18,7 +18,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index cc1aa14..ec88656 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -28,7 +28,6 @@
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/random.h>
#include <linux/usb.h>
diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index f8a60c1..aa643df 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*/
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/wait.h>
#include <linux/fs.h>
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index 29724af..94c5051 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -29,7 +29,6 @@
#include <linux/interrupt.h>
#include <linux/firmware.h>
#include <linux/crc32.h>
-#include <linux/init.h>
#include <linux/input.h>
#include <linux/mutex.h>
diff --git a/drivers/media/usb/usbtv/usbtv.c b/drivers/media/usb/usbtv/usbtv.c
index 6222a4a..80262e1 100644
--- a/drivers/media/usb/usbtv/usbtv.c
+++ b/drivers/media/usb/usbtv/usbtv.c
@@ -28,7 +28,6 @@
* GNU General Public License ("GPL").
*/
-#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index 816b1cf..191dd2b 100644
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -31,7 +31,6 @@
#include <linux/highmem.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/videodev2.h>
diff --git a/drivers/media/usb/usbvision/usbvision-i2c.c b/drivers/media/usb/usbvision/usbvision-i2c.c
index ba262a3..ae1a1e6 100644
--- a/drivers/media/usb/usbvision/usbvision-i2c.c
+++ b/drivers/media/usb/usbvision/usbvision-i2c.c
@@ -27,7 +27,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/uaccess.h>
#include <linux/ioport.h>
#include <linux/errno.h>
diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
index 74d56df..764c655e 100644
--- a/drivers/media/usb/zr364xx/zr364xx.c
+++ b/drivers/media/usb/zr364xx/zr364xx.c
@@ -29,7 +29,6 @@
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/usb.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 20c0922..f9f6d71 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -24,7 +24,6 @@
#include <linux/poll.h>
#include <linux/i2c.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/videodev2.h>
#include <media/tuner.h>
#include <media/tuner-types.h>
diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index fb5ee5d..b837626 100644
--- a/drivers/media/v4l2-core/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
@@ -13,7 +13,6 @@
* the Free Software Foundation; either version 2
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/mm.h>
diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c
index 65411ad..557d42e 100644
--- a/drivers/media/v4l2-core/videobuf-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf-dma-contig.c
@@ -14,7 +14,6 @@
* the Free Software Foundation; either version 2
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index 9db674c..20c4849 100644
--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
@@ -18,7 +18,6 @@
* the Free Software Foundation; either version 2
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/sched.h>
diff --git a/drivers/media/v4l2-core/videobuf-dvb.c b/drivers/media/v4l2-core/videobuf-dvb.c
index b7efa45..210a7cb 100644
--- a/drivers/media/v4l2-core/videobuf-dvb.c
+++ b/drivers/media/v4l2-core/videobuf-dvb.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/fs.h>
#include <linux/kthread.h>
diff --git a/drivers/media/v4l2-core/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
index 1365c65..8c524fd 100644
--- a/drivers/media/v4l2-core/videobuf-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf-vmalloc.c
@@ -13,7 +13,6 @@
* the Free Software Foundation; either version 2
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/slab.h>
--
1.8.4.1
These two drivers are configured with Kconfig options that are
both declared as bool. Hence it is not possible for the code
to be built as modular. However the code is currently using the
module_platform_driver() macro for driver registration.
While this currently works, we really don't want to be including
the module.h header in non-modular code, which we'll be forced
to do, pending some upcoming code relocation from init.h into
module.h. So we fix it now by using the non-modular equivalent.
With some macro detangulation, and a little help from cpp, we can
see that module_platform_driver(calxeda_cpuidle_plat_driver) gets
roughly translated into:
static int __init calxeda_cpuidle_plat_driver_init(void)
{
return platform_driver_register(&calxeda_cpuidle_plat_driver);
}
module_init(calxeda_cpuidle_plat_driver_init);
static void __exit calxeda_cpuidle_plat_driver_exit(void)
{
platform_driver_unregister(&calxeda_cpuidle_plat_driver);
}
module_exit(calxeda_cpuidle_plat_driver_exit);
[and similarly for the other file, cpuidle-zynq.c]
And since we've already established that the code is non-modular,
we can completely drop any code relating to module_exit. For non
modular code, module_init beomes __initcall. But direct use of
__initcall is discouraged, vs. one of the priority categorized
subgroups. As __initcall gets mapped onto device_initcall, our
use of device_initcall directly in this change means that the
runtime impact is zero -- they will remain at level 6 in the
initcall ordering.
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Daniel Lezcano <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/cpuidle/cpuidle-calxeda.c | 6 +++++-
drivers/cpuidle/cpuidle-zynq.c | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c
index 6e51114..631e2cd 100644
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -78,4 +78,8 @@ static struct platform_driver calxeda_cpuidle_plat_driver = {
.probe = calxeda_cpuidle_probe,
};
-module_platform_driver(calxeda_cpuidle_plat_driver);
+static int __init calxeda_cpuidle_plat_driver_init(void)
+{
+ return platform_driver_register(&calxeda_cpuidle_plat_driver);
+}
+device_initcall(calxeda_cpuidle_plat_driver_init);
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index aded759..a1aae51 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -85,4 +85,8 @@ static struct platform_driver zynq_cpuidle_driver = {
.probe = zynq_cpuidle_probe,
};
-module_platform_driver(zynq_cpuidle_driver);
+static int __init zynq_cpuidle_driver_init(void)
+{
+ return platform_driver_register(&zynq_cpuidle_driver);
+}
+device_initcall(zynq_cpuidle_driver_init);
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Mark Brown <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/spi/spi-altera.c | 1 -
drivers/spi/spi-ath79.c | 1 -
drivers/spi/spi-atmel.c | 1 -
drivers/spi/spi-bcm63xx.c | 1 -
drivers/spi/spi-bfin-sport.c | 1 -
drivers/spi/spi-bitbang.c | 1 -
drivers/spi/spi-clps711x.c | 1 -
drivers/spi/spi-gpio.c | 1 -
drivers/spi/spi-imx.c | 1 -
drivers/spi/spi-mpc512x-psc.c | 1 -
drivers/spi/spi-mpc52xx-psc.c | 1 -
drivers/spi/spi-mpc52xx.c | 1 -
drivers/spi/spi-mxs.c | 1 -
drivers/spi/spi-nuc900.c | 1 -
drivers/spi/spi-oc-tiny.c | 1 -
drivers/spi/spi-octeon.c | 1 -
drivers/spi/spi-omap2-mcspi.c | 1 -
drivers/spi/spi-orion.c | 1 -
drivers/spi/spi-ppc4xx.c | 1 -
drivers/spi/spi-pxa2xx-dma.c | 1 -
drivers/spi/spi-pxa2xx-pxadma.c | 1 -
drivers/spi/spi-s3c24xx.c | 1 -
drivers/spi/spi-sh-msiof.c | 1 -
drivers/spi/spi-sh-sci.c | 1 -
drivers/spi/spi-tegra114.c | 1 -
drivers/spi/spi-tegra20-sflash.c | 1 -
drivers/spi/spi-tegra20-slink.c | 1 -
drivers/spi/spi-xcomm.c | 1 -
drivers/spi/spi-xilinx.c | 1 -
29 files changed, 29 deletions(-)
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 5d7deaf..1928b83 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -13,7 +13,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/module.h>
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 31534b5..a1cf9af 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index b0842f7..88796df 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -9,7 +9,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 77286ae..9e9ee5f 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -20,7 +20,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/module.h>
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 38941e5..f515c5e 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -8,7 +8,6 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/device.h>
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index bd222f6..3bfdb85 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 374ba4a..bee864d 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -11,7 +11,6 @@
#include <linux/io.h>
#include <linux/clk.h>
-#include <linux/init.h>
#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/module.h>
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 7beeb29..cfc9fb3 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -19,7 +19,6 @@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/of.h>
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index a5474ef..8a77b7b 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -23,7 +23,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 5032141..56cead9 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/of_address.h>
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 00ba910..3d18d93 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index 7c675fe..f573c3c 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/of_platform.h>
#include <linux/interrupt.h>
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 79e5aa2..17bb9a9 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -29,7 +29,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index 5040630..8181c69 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -9,7 +9,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index f7c896e..022774e 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -15,7 +15,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/module.h>
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 67249a4..5665ae9 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -11,7 +11,6 @@
#include <linux/spi/spi.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/of.h>
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index a72127f..94f133c 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -22,7 +22,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/device.h>
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 7f2121f..a362425 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 5ee5672..80b8408 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -24,7 +24,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/errno.h>
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index 3c0b551..713af48 100644
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c
index 2916efc..e8a26f2 100644
--- a/drivers/spi/spi-pxa2xx-pxadma.c
+++ b/drivers/spi/spi-pxa2xx-pxadma.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 746424a..c20df45 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -9,7 +9,6 @@
*
*/
-#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 81cc02f..3347406 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -15,7 +15,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 38eb24d..85c2efd 100644
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -14,7 +14,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 413c718..3f61bbf 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -23,7 +23,6 @@
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 0879497..18037ab 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -22,7 +22,6 @@
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index be3a069..8d62710 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -23,7 +23,6 @@
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index 24c40b1..350a76b 100644
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -8,7 +8,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/i2c.h>
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 6d4ce46..e6cd111 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/of.h>
#include <linux/platform_device.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Jean-Christophe Plagniol-Villard <[email protected]>
Cc: Tomi Valkeinen <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/video/aty/aty128fb.c | 1 -
drivers/video/aty/mach64_cursor.c | 1 -
drivers/video/auo_k1900fb.c | 1 -
drivers/video/auo_k1901fb.c | 1 -
drivers/video/backlight/88pm860x_bl.c | 1 -
drivers/video/backlight/adp5520_bl.c | 1 -
drivers/video/backlight/adp8860_bl.c | 1 -
drivers/video/backlight/adp8870_bl.c | 1 -
drivers/video/backlight/corgi_lcd.c | 1 -
drivers/video/backlight/da903x_bl.c | 1 -
drivers/video/backlight/generic_bl.c | 1 -
drivers/video/backlight/ili922x.c | 1 -
drivers/video/backlight/ili9320.c | 1 -
drivers/video/backlight/lm3533_bl.c | 1 -
drivers/video/backlight/ltv350qv.c | 1 -
drivers/video/backlight/max8925_bl.c | 1 -
drivers/video/backlight/omap1_bl.c | 1 -
drivers/video/backlight/pwm_bl.c | 1 -
drivers/video/backlight/tdo24m.c | 1 -
drivers/video/backlight/vgg2432a4.c | 1 -
drivers/video/backlight/wm831x_bl.c | 1 -
drivers/video/bfin-lq035q1-fb.c | 1 -
drivers/video/clps711xfb.c | 1 -
drivers/video/console/dummycon.c | 1 -
drivers/video/console/sticore.c | 1 -
drivers/video/goldfishfb.c | 1 -
drivers/video/i810/i810_main.c | 1 -
drivers/video/intelfb/intelfbhw.c | 1 -
drivers/video/matrox/matroxfb_base.h | 1 -
drivers/video/mb862xx/mb862xxfb_accel.c | 1 -
drivers/video/mb862xx/mb862xxfbdrv.c | 1 -
drivers/video/mbx/mbxfb.c | 1 -
drivers/video/nuc900fb.c | 1 -
drivers/video/nvidia/nvidia.c | 1 -
drivers/video/pxa168fb.c | 1 -
drivers/video/riva/fbdev.c | 1 -
drivers/video/s3c-fb.c | 1 -
drivers/video/sh_mobile_lcdcfb.c | 1 -
drivers/video/sm501fb.c | 1 -
drivers/video/smscufx.c | 1 -
drivers/video/sstfb.c | 1 -
drivers/video/tgafb.c | 1 -
drivers/video/udlfb.c | 1 -
drivers/video/uvesafb.c | 1 -
drivers/video/via/global.h | 1 -
drivers/video/vt8500lcdfb.c | 1 -
drivers/video/w100fb.c | 1 -
drivers/video/wm8505fb.c | 1 -
drivers/video/xilinxfb.c | 1 -
49 files changed, 49 deletions(-)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 52108be..f572384 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -57,7 +57,6 @@
#include <linux/interrupt.h>
#include <linux/uaccess.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/console.h>
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 95ec042..af16ef6 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -3,7 +3,6 @@
*/
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/string.h>
#include <asm/io.h>
diff --git a/drivers/video/auo_k1900fb.c b/drivers/video/auo_k1900fb.c
index f5b668e..e81f4c5 100644
--- a/drivers/video/auo_k1900fb.c
+++ b/drivers/video/auo_k1900fb.c
@@ -35,7 +35,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/list.h>
#include <linux/firmware.h>
diff --git a/drivers/video/auo_k1901fb.c b/drivers/video/auo_k1901fb.c
index 12b9adc..3ccb91c 100644
--- a/drivers/video/auo_k1901fb.c
+++ b/drivers/video/auo_k1901fb.c
@@ -39,7 +39,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/list.h>
#include <linux/firmware.h>
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 7db5234..955632e 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index f37097a..bb7ab3c 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -7,7 +7,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/backlight.h>
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 9d65671..0a23509 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -7,7 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pm.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 6370720..2b3c91c 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -7,7 +7,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pm.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index db8db5f..db4c094 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/fb.h>
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 12c5d84..7a48447 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -13,7 +13,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/backlight.h>
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 5d8d652..06dca66 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/fb.h>
diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c
index 73464e4..877426e 100644
--- a/drivers/video/backlight/ili922x.c
+++ b/drivers/video/backlight/ili922x.c
@@ -15,7 +15,6 @@
#include <linux/fb.h>
#include <linux/delay.h>
#include <linux/errno.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/lcd.h>
#include <linux/module.h>
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index e2b8b40..42175d1 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -14,7 +14,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/lcd.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 187d1c2..b6c642d 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -12,7 +12,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/backlight.h>
#include <linux/fb.h>
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index 383f550..77c509d 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -10,7 +10,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/lcd.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 66fa08c..75f5b7b 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/fb.h>
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index a0dcd88..dbd863c 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/backlight.h>
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index b75201f..15ada9f 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -14,7 +14,6 @@
#include <linux/of_gpio.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/fb.h>
#include <linux/backlight.h>
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 908016f..b5ab1da 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/device.h>
#include <linux/spi/spi.h>
#include <linux/spi/tdo24m.h>
diff --git a/drivers/video/backlight/vgg2432a4.c b/drivers/video/backlight/vgg2432a4.c
index d538947..fac8577 100644
--- a/drivers/video/backlight/vgg2432a4.c
+++ b/drivers/video/backlight/vgg2432a4.c
@@ -14,7 +14,6 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/lcd.h>
#include <linux/module.h>
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 8b9455e..16ebb3e 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -9,7 +9,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/fb.h>
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
index b594a58..f2dce09 100644
--- a/drivers/video/bfin-lq035q1-fb.c
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -15,7 +15,6 @@
#include <linux/fb.h>
#include <linux/gpio.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/device.h>
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index f009806..bec42d5 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index b63860f..b734028 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -10,7 +10,6 @@
#include <linux/console.h>
#include <linux/vt_kern.h>
#include <linux/screen_info.h>
-#include <linux/init.h>
#include <linux/module.h>
/*
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 4ad24f2..a077504 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/font.h>
diff --git a/drivers/video/goldfishfb.c b/drivers/video/goldfishfb.c
index 7f6c9e6..7bdb1ba 100644
--- a/drivers/video/goldfishfb.c
+++ b/drivers/video/goldfishfb.c
@@ -22,7 +22,6 @@
#include <linux/delay.h>
#include <linux/mm.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index bb674e4..d5df169 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -35,7 +35,6 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/resource.h>
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index fbad61d..f3374c9 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -27,7 +27,6 @@
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index 11ed57b..e8d4ac5 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -36,7 +36,6 @@
#include <linux/console.h>
#include <linux/selection.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/timer.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
index fe92eed..a24a482 100644
--- a/drivers/video/mb862xx/mb862xxfb_accel.c
+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
@@ -14,7 +14,6 @@
*/
#include <linux/fb.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/pci.h>
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index 0cd4c33..c2bfed4 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -18,7 +18,6 @@
#include <linux/delay.h>
#include <linux/uaccess.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#if defined(CONFIG_OF)
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index f0a5392..30a0511 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -22,7 +22,6 @@
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/uaccess.h>
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 478f980..9cdf9b6 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -23,7 +23,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index def0412..da7cb5e 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -17,7 +17,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/console.h>
#include <linux/backlight.h>
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index c95b9e4..727db73 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -20,7 +20,6 @@
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 8a8d7f0..3ba0bb0 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -37,7 +37,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/backlight.h>
#include <linux/bitrev.h>
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 62acae2..4dc781e 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -17,7 +17,6 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/clk.h>
#include <linux/fb.h>
#include <linux/io.h>
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 2bcc84a..fec86d6 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -16,7 +16,6 @@
#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ioctl.h>
#include <linux/kernel.h>
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 1501979..3d84279 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -20,7 +20,6 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/vmalloc.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
index d513ed6..694033c 100644
--- a/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/usb.h>
#include <linux/uaccess.h>
#include <linux/mm.h>
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index f0cb279..f10ca57 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -85,7 +85,6 @@
#include <linux/fb.h>
#include <linux/pci.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <asm/io.h>
#include <linux/uaccess.h>
#include <video/sstfb.h>
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 07c7df9..90e2583 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -18,7 +18,6 @@
#include <linux/device.h>
#include <linux/errno.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/mm.h>
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 77b890e..c00aec3 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/usb.h>
#include <linux/uaccess.h>
#include <linux/mm.h>
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 256fba7..9b2c7b5 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -5,7 +5,6 @@
* Loosely based upon the vesafb driver.
*
*/
-#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/skbuff.h>
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
index 275dbbb..d356dec 100644
--- a/drivers/video/via/global.h
+++ b/drivers/video/via/global.h
@@ -28,7 +28,6 @@
#include <linux/pci.h>
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/console.h>
#include <linux/timer.h>
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
index a8f2b28..dc55ef4 100644
--- a/drivers/video/vt8500lcdfb.c
+++ b/drivers/video/vt8500lcdfb.c
@@ -19,7 +19,6 @@
#include <linux/dma-mapping.h>
#include <linux/errno.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 10951c8..1c55014 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -26,7 +26,6 @@
#include <linux/delay.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/platform_device.h>
diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index 537d199..fc8e0d7 100644
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -19,7 +19,6 @@
#include <linux/fb.h>
#include <linux/errno.h>
#include <linux/err.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h>
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 6ff1a91..4506252 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -27,7 +27,6 @@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/fb.h>
-#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: Richard Henderson <[email protected]>
Cc: Ivan Kokshaysky <[email protected]>
Cc: Matt Turner <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/alpha/kernel/err_ev6.c | 1 -
arch/alpha/kernel/irq.c | 1 -
arch/alpha/kernel/traps.c | 1 -
arch/alpha/oprofile/op_model_ev4.c | 1 -
arch/alpha/oprofile/op_model_ev5.c | 1 -
arch/alpha/oprofile/op_model_ev6.c | 1 -
arch/alpha/oprofile/op_model_ev67.c | 1 -
7 files changed, 7 deletions(-)
diff --git a/arch/alpha/kernel/err_ev6.c b/arch/alpha/kernel/err_ev6.c
index 253cf1a..51267ac 100644
--- a/arch/alpha/kernel/err_ev6.c
+++ b/arch/alpha/kernel/err_ev6.c
@@ -6,7 +6,6 @@
* Error handling code supporting Alpha systems
*/
-#include <linux/init.h>
#include <linux/sched.h>
#include <asm/io.h>
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 7b2be25..51f2c86 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -19,7 +19,6 @@
#include <linux/ptrace.h>
#include <linux/interrupt.h>
#include <linux/random.h>
-#include <linux/init.h>
#include <linux/irq.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 9c4c189..74aceea 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -14,7 +14,6 @@
#include <linux/tty.h>
#include <linux/delay.h>
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kallsyms.h>
#include <linux/ratelimit.h>
diff --git a/arch/alpha/oprofile/op_model_ev4.c b/arch/alpha/oprofile/op_model_ev4.c
index 18aa9b4..086a0d5 100644
--- a/arch/alpha/oprofile/op_model_ev4.c
+++ b/arch/alpha/oprofile/op_model_ev4.c
@@ -8,7 +8,6 @@
*/
#include <linux/oprofile.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/ptrace.h>
diff --git a/arch/alpha/oprofile/op_model_ev5.c b/arch/alpha/oprofile/op_model_ev5.c
index c32f8a0..c300f5e 100644
--- a/arch/alpha/oprofile/op_model_ev5.c
+++ b/arch/alpha/oprofile/op_model_ev5.c
@@ -8,7 +8,6 @@
*/
#include <linux/oprofile.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/ptrace.h>
diff --git a/arch/alpha/oprofile/op_model_ev6.c b/arch/alpha/oprofile/op_model_ev6.c
index 1c84cc2..02edf59 100644
--- a/arch/alpha/oprofile/op_model_ev6.c
+++ b/arch/alpha/oprofile/op_model_ev6.c
@@ -8,7 +8,6 @@
*/
#include <linux/oprofile.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/ptrace.h>
diff --git a/arch/alpha/oprofile/op_model_ev67.c b/arch/alpha/oprofile/op_model_ev67.c
index 34a57a1..adb1744 100644
--- a/arch/alpha/oprofile/op_model_ev67.c
+++ b/arch/alpha/oprofile/op_model_ev67.c
@@ -9,7 +9,6 @@
*/
#include <linux/oprofile.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/ptrace.h>
--
1.8.4.1
They use the "_INIT" macro and friends, and hence need to
source this header file, vs. relying on getting it implicitly.
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/arm/kernel/entry-armv.S | 2 ++
arch/arm/vfp/entry.S | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index b3fb8c9..ffc1c74 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -15,6 +15,8 @@
* that causes it to save wrong values... Be aware!
*/
+#include <linux/init.h>
+
#include <asm/assembler.h>
#include <asm/memory.h>
#include <asm/glue-df.h>
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 46e1749..ec7ea24 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -8,6 +8,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/init.h>
+
#include <asm/thread_info.h>
#include <asm/vfpmacros.h>
#include "../kernel/entry-header.S"
--
1.8.4.1
The drivers/mailbox/pl320-ipc.o is dependent on config PL320_MBOX
which is declared as a bool. Hence the code is never going to be
modular. So using module_init as an alias for __initcall can be
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing. Also add an inclusion of init.h, as
that was previously implicit.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of subsys_initcall (which
seems to make sense for netfilter code) will thus change this
registration from level 6-device to level 4-subsys (i.e. slightly
earlier). However no impact of that small difference is expected.
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/mailbox/pl320-ipc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mailbox/pl320-ipc.c b/drivers/mailbox/pl320-ipc.c
index d873cba..b2737a2 100644
--- a/drivers/mailbox/pl320-ipc.c
+++ b/drivers/mailbox/pl320-ipc.c
@@ -195,4 +195,4 @@ static int __init ipc_init(void)
{
return amba_driver_register(&pl320_driver);
}
-module_init(ipc_init);
+subsys_initcall(ipc_init);
--
1.8.4.1
The config OMAP_INTERCONNECT that this driver depends on (in
drivers/bus/Kconfig) is tristate. So it can be a module.
Also there are module related setup calls within this driver.
Explicitly add module.h to includes so it won't be a build failure
when future cleanups are integrated and the implicit presence
of certain module prototypes disappears.
Cc: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/bus/omap_l3_smx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bus/omap_l3_smx.c b/drivers/bus/omap_l3_smx.c
index acc2164..8a61433 100644
--- a/drivers/bus/omap_l3_smx.c
+++ b/drivers/bus/omap_l3_smx.c
@@ -23,6 +23,7 @@
*/
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
--
1.8.4.1
The rtc.o is built for obj-y, i.e. always built in. It will
never be modular, so using module_init as an alias for __initcall
can be somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Geert Uytterhoeven <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/m68k/mvme16x/rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 6ef7a81..1755e2f 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -161,4 +161,4 @@ static int __init rtc_MK48T08_init(void)
printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
return misc_register(&rtc_dev);
}
-module_init(rtc_MK48T08_init);
+device_initcall(rtc_MK48T08_init);
--
1.8.4.1
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/sparc/kernel/cpumap.c | 1 -
arch/sparc/kernel/ebus.c | 1 -
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/of_device_common.c | 1 -
arch/sparc/kernel/pci_common.c | 1 -
arch/sparc/kernel/process_32.c | 1 -
arch/sparc/kernel/sparc_ksyms_32.c | 1 -
arch/sparc/kernel/sparc_ksyms_64.c | 1 -
arch/sparc/kernel/trampoline_32.S | 1 -
arch/sparc/kernel/trampoline_64.S | 1 -
arch/sparc/mm/hugetlbpage.c | 1 -
arch/sparc/mm/tlb.c | 1 -
arch/sparc/prom/p1275.c | 1 -
drivers/sbus/char/bbc_i2c.c | 1 -
drivers/sbus/char/display7seg.c | 1 -
drivers/sbus/char/envctrl.c | 1 -
drivers/sbus/char/flash.c | 1 -
drivers/sbus/char/uctrl.c | 1 -
18 files changed, 18 deletions(-)
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index cb5d272..de1c844 100644
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -6,7 +6,6 @@
#include <linux/export.h>
#include <linux/slab.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/cpumask.h>
#include <linux/spinlock.h>
#include <asm/cpudata.h>
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index e306fb08..acf8314 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -7,7 +7,6 @@
#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/arch/sparc/kernel/hvtramp.S b/arch/sparc/kernel/hvtramp.S
index 4eb1a5a..b7ddcdd 100644
--- a/arch/sparc/kernel/hvtramp.S
+++ b/arch/sparc/kernel/hvtramp.S
@@ -3,7 +3,6 @@
* Copyright (C) 2007, 2008 David S. Miller <[email protected]>
*/
-#include <linux/init.h>
#include <asm/thread_info.h>
#include <asm/hypervisor.h>
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index de199bf..3241f56 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -1,7 +1,6 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/of.h>
-#include <linux/init.h>
#include <linux/export.h>
#include <linux/mod_devicetable.h>
#include <linux/errno.h>
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index a689598..944a065 100644
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -5,7 +5,6 @@
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/init.h>
#include <linux/pci.h>
#include <linux/device.h>
#include <linux/of_device.h>
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index fdd819d..510baec 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -22,7 +22,6 @@
#include <linux/reboot.h>
#include <linux/delay.h>
#include <linux/pm.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <asm/auxio.h>
diff --git a/arch/sparc/kernel/sparc_ksyms_32.c b/arch/sparc/kernel/sparc_ksyms_32.c
index e521c54..bf4ccb1 100644
--- a/arch/sparc/kernel/sparc_ksyms_32.c
+++ b/arch/sparc/kernel/sparc_ksyms_32.c
@@ -6,7 +6,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c
index 9f5e24d..a92d5d2 100644
--- a/arch/sparc/kernel/sparc_ksyms_64.c
+++ b/arch/sparc/kernel/sparc_ksyms_64.c
@@ -7,7 +7,6 @@
#include <linux/export.h>
#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <asm/cpudata.h>
diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S
index 76dcbd3..3eed99f 100644
--- a/arch/sparc/kernel/trampoline_32.S
+++ b/arch/sparc/kernel/trampoline_32.S
@@ -5,7 +5,6 @@
* Copyright (C) 1998 Jakub Jelinek ([email protected])
*/
-#include <linux/init.h>
#include <asm/head.h>
#include <asm/psr.h>
#include <asm/page.h>
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index ad4bde3..737f8cb 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -4,7 +4,6 @@
* Copyright (C) 1997 David S. Miller ([email protected])
*/
-#include <linux/init.h>
#include <asm/head.h>
#include <asm/asi.h>
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
index 3096317..9bd9ce8 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -4,7 +4,6 @@
* Copyright (C) 2002, 2003, 2006 David S. Miller ([email protected])
*/
-#include <linux/init.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/hugetlb.h>
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index ad3bf4b..b12cb5e 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -4,7 +4,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/percpu.h>
#include <linux/mm.h>
#include <linux/swap.h>
diff --git a/arch/sparc/prom/p1275.c b/arch/sparc/prom/p1275.c
index 04a4540..e58b817 100644
--- a/arch/sparc/prom/p1275.c
+++ b/arch/sparc/prom/p1275.c
@@ -5,7 +5,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/string.h>
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index c1441ed..c7763e4 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -11,7 +11,6 @@
#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/of.h>
#include <linux/of_device.h>
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index fc1339c..7c71e7b 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -9,7 +9,6 @@
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/major.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/ioport.h> /* request_region */
#include <linux/slab.h>
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index ddbe5a9..af15a2f 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -19,7 +19,6 @@
*/
#include <linux/module.h>
-#include <linux/init.h>
#include <linux/kthread.h>
#include <linux/delay.h>
#include <linux/ioport.h>
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index d9f268f..25c738e 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -9,7 +9,6 @@
#include <linux/miscdevice.h>
#include <linux/fcntl.h>
#include <linux/poll.h>
-#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index b0aae05..b7acafc 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/ioport.h>
-#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/mm.h>
#include <linux/of.h>
--
1.8.4.1
This driver is configured with a Kconfig option that is
declared as a bool. Hence it is not possible for the code
to be built as modular. However the code is currently using
the module_platform_driver() macro for driver registration.
While this currently works, we really don't want to be including
the module.h header in non-modular code, which we'll be forced
to do, pending some upcoming code relocation from init.h into
module.h. So we fix it now by using the non-modular equivalent.
With some macro detangulation, and a little help from cpp, we can
see that module_platform_driver(goldfish_pdev_bus_driver) gets
roughly translated into:
static int __init goldfish_pdev_bus_driver_init(void)
{
return platform_driver_register(&goldfish_pdev_bus_driver);
}
module_init(goldfish_pdev_bus_driver_init);
static void __exit goldfish_pdev_bus_driver_exit(void)
{
platform_driver_unregister(&goldfish_pdev_bus_driver);
}
module_exit(goldfish_pdev_bus_driver_exit);
And since we've already established that the code is non-modular,
we can completely drop any code relating to module_exit. For non
modular code, module_init beomes __initcall. But direct use of
__initcall is discouraged, vs. one of the priority categorized
subgroups. As __initcall gets mapped onto device_initcall, our
use of device_initcall directly in this change means that the
runtime impact is zero -- they will remain at level 6 in the
initcall ordering.
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/platform/goldfish/pdev_bus.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cf..e4e999f 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -221,20 +221,15 @@ free_resources:
return ret;
}
-static int goldfish_pdev_bus_remove(struct platform_device *pdev)
-{
- iounmap(pdev_bus_base);
- free_irq(pdev_bus_irq, pdev);
- release_mem_region(pdev_bus_addr, pdev_bus_len);
- return 0;
-}
-
static struct platform_driver goldfish_pdev_bus_driver = {
.probe = goldfish_pdev_bus_probe,
- .remove = goldfish_pdev_bus_remove,
.driver = {
.name = "goldfish_pdev_bus"
}
};
-module_platform_driver(goldfish_pdev_bus_driver);
+static int __init goldfish_pdev_bus_driver_init(void)
+{
+ return platform_driver_register(&goldfish_pdev_bus_driver);
+}
+device_initcall(goldfish_pdev_bus_driver_init);
--
1.8.4.1
This file is controlled by a tristate Kconfig option, and hence
needs to include module.h so that it can get module_init() once
we relocate it from init.h into module.h in the future.
Note that module_exit() appears to be missing from the driver, so
it is questionable whether it would actually work for a removal
and reload cycle if it was configured for a modular build.
Cc: Wolfram Sang <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/i2c/busses/i2c-acorn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c
index ed9f48d..9d7be5a 100644
--- a/drivers/i2c/busses/i2c-acorn.c
+++ b/drivers/i2c/busses/i2c-acorn.c
@@ -12,7 +12,7 @@
* On Acorn machines, the following i2c devices are on the bus:
* - PCF8583 real time clock & static RAM
*/
-#include <linux/init.h>
+#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/io.h>
--
1.8.4.1
Hi!
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Greg Kroah-Hartman <[email protected]>
Looks good to me.
Acked-by: Pavel Machek <[email protected]>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Modular users will always be users of init functionality, but
users of init functionality are not necessarily always modules.
Hence any functionality like module_init and module_exit would
be more at home in the module.h file. And module.h should
explicitly include init.h to make the dependency clear.
We've already done all the legwork needed to ensure that this
move does not cause any build regressions due to implicit
header file include assumptions about where module_init lives.
Cc: Rusty Russell <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
include/linux/init.h | 66 ---------------------------------------------
include/linux/module.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 66 deletions(-)
diff --git a/include/linux/init.h b/include/linux/init.h
index f693cc3..630beb3 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -244,56 +244,8 @@ void __init parse_early_param(void);
void __init parse_early_options(char *cmdline);
#endif /* __ASSEMBLY__ */
-/**
- * module_init() - driver initialization entry point
- * @x: function to be run at kernel boot time or module insertion
- *
- * module_init() will either be called during do_initcalls() (if
- * builtin) or at module insertion time (if a module). There can only
- * be one per module.
- */
-#define module_init(x) __initcall(x);
-
-/**
- * module_exit() - driver exit entry point
- * @x: function to be run when driver is removed
- *
- * module_exit() will wrap the driver clean-up code
- * with cleanup_module() when used with rmmod when
- * the driver is a module. If the driver is statically
- * compiled into the kernel, module_exit() has no effect.
- * There can only be one per module.
- */
-#define module_exit(x) __exitcall(x);
-
#else /* MODULE */
-/* Don't use these in loadable modules, but some people do... */
-#define early_initcall(fn) module_init(fn)
-#define core_initcall(fn) module_init(fn)
-#define postcore_initcall(fn) module_init(fn)
-#define arch_initcall(fn) module_init(fn)
-#define subsys_initcall(fn) module_init(fn)
-#define fs_initcall(fn) module_init(fn)
-#define rootfs_initcall(fn) module_init(fn)
-#define device_initcall(fn) module_init(fn)
-#define late_initcall(fn) module_init(fn)
-
-#define console_initcall(fn) module_init(fn)
-#define security_initcall(fn) module_init(fn)
-
-/* Each module must use one module_init(). */
-#define module_init(initfn) \
- static inline initcall_t __inittest(void) \
- { return initfn; } \
- int init_module(void) __attribute__((alias(#initfn)));
-
-/* This is only required if you want to be unloadable. */
-#define module_exit(exitfn) \
- static inline exitcall_t __exittest(void) \
- { return exitfn; } \
- void cleanup_module(void) __attribute__((alias(#exitfn)));
-
#define __setup_param(str, unique_id, fn) /* nothing */
#define __setup(str, func) /* nothing */
#endif
@@ -301,24 +253,6 @@ void __init parse_early_options(char *cmdline);
/* Data marked not to be saved by software suspend */
#define __nosavedata __section(.data..nosave)
-/* This means "can be init if no module support, otherwise module load
- may call it." */
-#ifdef CONFIG_MODULES
-#define __init_or_module
-#define __initdata_or_module
-#define __initconst_or_module
-#define __INIT_OR_MODULE .text
-#define __INITDATA_OR_MODULE .data
-#define __INITRODATA_OR_MODULE .section ".rodata","a",%progbits
-#else
-#define __init_or_module __init
-#define __initdata_or_module __initdata
-#define __initconst_or_module __initconst
-#define __INIT_OR_MODULE __INIT
-#define __INITDATA_OR_MODULE __INITDATA
-#define __INITRODATA_OR_MODULE __INITRODATA
-#endif /*CONFIG_MODULES*/
-
#ifdef MODULE
#define __exit_p(x) x
#else
diff --git a/include/linux/module.h b/include/linux/module.h
index eaf60ff..b1d96e7 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -11,6 +11,7 @@
#include <linux/compiler.h>
#include <linux/cache.h>
#include <linux/kmod.h>
+#include <linux/init.h>
#include <linux/elf.h>
#include <linux/stringify.h>
#include <linux/kobject.h>
@@ -91,6 +92,77 @@ extern const struct gtype##_id __mod_##gtype##_table \
#define MODULE_GENERIC_TABLE(gtype, name)
#endif
+#ifndef MODULE
+/**
+ * module_init() - driver initialization entry point
+ * @x: function to be run at kernel boot time or module insertion
+ *
+ * module_init() will either be called during do_initcalls() (if
+ * builtin) or at module insertion time (if a module). There can only
+ * be one per module.
+ */
+#define module_init(x) __initcall(x);
+
+/**
+ * module_exit() - driver exit entry point
+ * @x: function to be run when driver is removed
+ *
+ * module_exit() will wrap the driver clean-up code
+ * with cleanup_module() when used with rmmod when
+ * the driver is a module. If the driver is statically
+ * compiled into the kernel, module_exit() has no effect.
+ * There can only be one per module.
+ */
+#define module_exit(x) __exitcall(x);
+
+#else /* MODULE */
+
+/* Don't use these in loadable modules, but some people do... */
+#define early_initcall(fn) module_init(fn)
+#define core_initcall(fn) module_init(fn)
+#define postcore_initcall(fn) module_init(fn)
+#define arch_initcall(fn) module_init(fn)
+#define subsys_initcall(fn) module_init(fn)
+#define fs_initcall(fn) module_init(fn)
+#define rootfs_initcall(fn) module_init(fn)
+#define device_initcall(fn) module_init(fn)
+#define late_initcall(fn) module_init(fn)
+
+#define console_initcall(fn) module_init(fn)
+#define security_initcall(fn) module_init(fn)
+
+/* Each module must use one module_init(). */
+#define module_init(initfn) \
+ static inline initcall_t __inittest(void) \
+ { return initfn; } \
+ int init_module(void) __attribute__((alias(#initfn)));
+
+/* This is only required if you want to be unloadable. */
+#define module_exit(exitfn) \
+ static inline exitcall_t __exittest(void) \
+ { return exitfn; } \
+ void cleanup_module(void) __attribute__((alias(#exitfn)));
+
+#endif
+
+/* This means "can be init if no module support, otherwise module load
+ may call it." */
+#ifdef CONFIG_MODULES
+#define __init_or_module
+#define __initdata_or_module
+#define __initconst_or_module
+#define __INIT_OR_MODULE .text
+#define __INITDATA_OR_MODULE .data
+#define __INITRODATA_OR_MODULE .section ".rodata","a",%progbits
+#else
+#define __init_or_module __init
+#define __initdata_or_module __initdata
+#define __initconst_or_module __initconst
+#define __INIT_OR_MODULE __INIT
+#define __INITDATA_OR_MODULE __INITDATA
+#define __INITRODATA_OR_MODULE __INITRODATA
+#endif /*CONFIG_MODULES*/
+
/* Generic info of form tag = "info" */
#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
--
1.8.4.1
The pci.o is built for SPARC64_PCI -- which is bool, and hence
this code is either present or absent. It will never be modular,
so using module_init as an alias for __initcall can be somewhat
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: "David S. Miller" <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/sparc/kernel/pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 7de8d1f..1555bbc 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -1005,6 +1005,5 @@ static int __init of_pci_slot_init(void)
return 0;
}
-
-module_init(of_pci_slot_init);
+device_initcall(of_pci_slot_init);
#endif
--
1.8.4.1
The header linux_logo.h itself does not use any __init type
directives, but the autogenerated C file itself does. Hence
move the include directive into the autogenerated file.
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
include/linux/linux_logo.h | 3 ---
scripts/pnmtologo.c | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index ca5bd91..aea584c 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -14,9 +14,6 @@
* but should contain %s to display the version
*/
-#include <linux/init.h>
-
-
#define LINUX_LOGO_MONO 1 /* monochrome black/white */
#define LINUX_LOGO_VGA16 2 /* 16 colors VGA text palette */
#define LINUX_LOGO_CLUT224 3 /* 224 colors */
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 68bb4ef..06a4b4e 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -243,6 +243,7 @@ static void write_header(void)
fputs(" *\n", out);
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
+ fputs("#include <linux/init.h>\n", out);
fputs("#include <linux/linux_logo.h>\n\n", out);
fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
logoname);
--
1.8.4.1
On Tue, Jan 21, 2014 at 04:22:47PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
Applied, thanks.
The mca.c code is always built in. It will never be modular,
so using module_init as an alias for __initcall is rather
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Direct use of __initcall is discouraged, vs prioritized ones.
Use of device_initcall is consistent with what __initcall
maps onto, and hence does not change the init order, making the
impact of this change zero. Should someone with real hardware
for boot testing want to change it later to arch_initcall or
something different, they can do that at a later date.
Cc: Tony Luck <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/ia64/sn/kernel/mca.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/ia64/sn/kernel/mca.c b/arch/ia64/sn/kernel/mca.c
index 27793f7..5b799d4d 100644
--- a/arch/ia64/sn/kernel/mca.c
+++ b/arch/ia64/sn/kernel/mca.c
@@ -142,5 +142,4 @@ static int __init sn_salinfo_init(void)
salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;
return 0;
}
-
-module_init(sn_salinfo_init)
+device_initcall(sn_salinfo_init);
--
1.8.4.1
On 14-01-21 04:37 PM, Geert Uytterhoeven wrote:
> On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker
> <[email protected]> wrote:
>> diff --git a/include/linux/zorro.h b/include/linux/zorro.h
>> index 63fbba0..529604b 100644
>> --- a/include/linux/zorro.h
>> +++ b/include/linux/zorro.h
>> @@ -15,7 +15,6 @@
>> #include <uapi/linux/zorro.h>
>>
>> #include <linux/device.h>
>> -#include <linux/init.h>
>> #include <linux/ioport.h>
>> #include <linux/mod_devicetable.h>
>
> There's an __initdata below in that file:
>
> extern struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
Aha, that was from a relatively recent commit; I'd done the original
version of this series last year on a tree that didn't have that.
Thanks for spotting it ; appreciate that -- will fix and push.
Paul.
--
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
>
The srm console is always built in. It will never be modular,
so using module_init as an alias for __initcall is rather
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Direct use of __initcall is discouraged, vs prioritized ones.
Use of device_initcall is consistent with what __initcall
maps onto, and hence does not change the init order, making the
impact of this change zero. Should someone with real hardware
for boot testing want to change it later to arch_initcall or
console_initcall, they can do that at a later date.
Cc: Richard Henderson <[email protected]>
Cc: Ivan Kokshaysky <[email protected]>
Cc: Matt Turner <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/alpha/kernel/srmcons.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 6f01d9a..72b5951 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -237,8 +237,7 @@ srmcons_init(void)
return -ENODEV;
}
-
-module_init(srmcons_init);
+device_initcall(srmcons_init);
/*
--
1.8.4.1
On Tuesday 21 January 2014 16:22:23 Paul Gortmaker wrote:
>
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups. As __initcall gets
> mapped onto device_initcall, our use of subsys_initcall (which
> seems to make sense for netfilter code) will thus change this
> registration from level 6-device to level 4-subsys (i.e. slightly
> earlier). However no impact of that small difference is expected.
This doesn't have anything to do with netfilter. The only user
of this driver at the moment is the highbank cpufreq driver, but
that could change.
Arnd
The FSL_SOC option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of subsys_initcall (which
makes sense for bus code) will thus change this registration
from level 6-device to level 4-subsys (i.e. slightly earlier).
However no observable impact of that small difference has
been observed during testing, or is expected.
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Scott Wood <[email protected]>
Acked-by: Scott Wood <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/sysdev/fsl_lbc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index d631022..38138cf 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -407,4 +407,4 @@ static int __init fsl_lbc_init(void)
{
return platform_driver_register(&fsl_lbc_ctrl_driver);
}
-module_init(fsl_lbc_init);
+subsys_initcall(fsl_lbc_init);
--
1.8.4.1
The simscsi.o is built for HP_SIMSCSI -- which is bool, and hence
this code is either present or absent. It will never be modular,
so using module_init as an alias for __initcall can be somewhat
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
And since it can't be modular, we remove all the __exitcall
stuff related to module_exit() -- it is dead code that won't
ever be executed.
Cc: Tony Luck <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/ia64/hp/sim/simscsi.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 3a428f1..085047f 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -368,13 +368,4 @@ simscsi_init(void)
scsi_host_put(host);
return error;
}
-
-static void __exit
-simscsi_exit(void)
-{
- scsi_remove_host(host);
- scsi_host_put(host);
-}
-
-module_init(simscsi_init);
-module_exit(simscsi_exit);
+device_initcall(simscsi_init);
--
1.8.4.1
The suspend.o is built for SUSPEND -- which is bool, and hence
this code is either present or absent. It will never be modular,
so using module_init as an alias for __initcall can be somewhat
misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Kumar Gala <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/platforms/83xx/suspend.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index 4b4c081..e9f07c6 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -446,5 +446,4 @@ static int pmc_init(void)
{
return platform_driver_register(&pmc_driver);
}
-
-module_init(pmc_init);
+device_initcall(pmc_init);
--
1.8.4.1
Even though KVM is bool, KVM_BOOK3S_32 and KVM_BOOK3S_64 are declared
as Kconfig tristate, so this file really should be including
module.h instead of export.h -- it only works currently because
module_init is currently (mis)placed in init.h -- but we are
intending to clean that up and relocate it to module.h
Cc: Gleb Natapov <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Alexander Graf <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/kvm/book3s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index 8912608..279459e 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -16,7 +16,7 @@
#include <linux/kvm_host.h>
#include <linux/err.h>
-#include <linux/export.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <asm/reg.h>
--
1.8.4.1
In powerpc, CONFIG_KVM is bool, and so are these three subarch
options, for the 44x and e500 variants. This means that any
module_exit() calls and functions used by them such as the
kvmppc_booke_exit() are dead code. Here we remove them.
In addition, rather than use module_init, which is just
__initcall for non-modules, we update those as well.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of subsys_initcall (which
seems to make sense for netfilter code) will thus change this
registration from level 6-device to level 4-subsys (i.e. slightly
earlier).
However no impact of that small difference is expected,
since the arch independent kvm code doesn't trigger any init;
it is the arch initcalls here which actually call kvm_init.
Cc: Gleb Natapov <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Alexander Graf <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/powerpc/include/asm/kvm_ppc.h | 1 -
arch/powerpc/kvm/44x.c | 10 +---------
arch/powerpc/kvm/booke.c | 6 ------
arch/powerpc/kvm/e500.c | 10 +---------
arch/powerpc/kvm/e500mc.c | 10 +---------
5 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index c8317fb..8466df5 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -109,7 +109,6 @@ extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);
extern int kvmppc_core_check_requests(struct kvm_vcpu *vcpu);
extern int kvmppc_booke_init(void);
-extern void kvmppc_booke_exit(void);
extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);
extern int kvmppc_kvm_pv(struct kvm_vcpu *vcpu);
diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index 93221e8..2129fc1 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -222,12 +222,4 @@ static int __init kvmppc_44x_init(void)
err_out:
return r;
}
-
-static void __exit kvmppc_44x_exit(void)
-{
- kvmppc_pr_ops = NULL;
- kvmppc_booke_exit();
-}
-
-module_init(kvmppc_44x_init);
-module_exit(kvmppc_44x_exit);
+subsys_initcall(kvmppc_44x_init);
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 0591e05..49dffa2 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -1995,9 +1995,3 @@ int __init kvmppc_booke_init(void)
#endif /* !BOOKE_HV */
return 0;
}
-
-void __exit kvmppc_booke_exit(void)
-{
- free_pages(kvmppc_booke_handlers, VCPU_SIZE_ORDER);
- kvm_exit();
-}
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 497b142..115ef12 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -564,12 +564,4 @@ static int __init kvmppc_e500_init(void)
err_out:
return r;
}
-
-static void __exit kvmppc_e500_exit(void)
-{
- kvmppc_pr_ops = NULL;
- kvmppc_booke_exit();
-}
-
-module_init(kvmppc_e500_init);
-module_exit(kvmppc_e500_exit);
+subsys_initcall(kvmppc_e500_init);
diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c
index 4132cd2..612c216 100644
--- a/arch/powerpc/kvm/e500mc.c
+++ b/arch/powerpc/kvm/e500mc.c
@@ -382,12 +382,4 @@ static int __init kvmppc_e500mc_init(void)
err_out:
return r;
}
-
-static void __exit kvmppc_e500mc_exit(void)
-{
- kvmppc_pr_ops = NULL;
- kvmppc_booke_exit();
-}
-
-module_init(kvmppc_e500mc_init);
-module_exit(kvmppc_e500mc_exit);
+subsys_initcall(kvmppc_e500mc_init);
--
1.8.4.1
The file net/ipv4/netfilter.o is created based on whether
CONFIG_NETFILTER is set. However that is defined as a bool, and
hence this file with the core netfilter hooks will never be
modular. So using module_init as an alias for __initcall can be
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing. Also add an inclusion of init.h, as
that was previously implicit here in the netfilter.c file.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of subsys_initcall (which
seems to make sense for netfilter code) will thus change this
registration from level 6-device to level 4-subsys (i.e. slightly
earlier). However no observable impact of that small difference
has been observed during testing, or is expected. (i.e. the
location of the netfilter messages in dmesg remains unchanged
with respect to all the other surrounding messages.)
As for the module_exit, rather than replace it with __exitcall,
we simply remove it, since it appears only UML does anything
with those, and even for UML, there is no relevant cleanup
to be done here.
Cc: Pablo Neira Ayuso <[email protected]>
Cc: Patrick McHardy <[email protected]>
Cc: Jozsef Kadlecsik <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
net/ipv4/netfilter.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index c3e0ade..31abf96 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -197,11 +197,4 @@ static int __init ipv4_netfilter_init(void)
{
return nf_register_afinfo(&nf_ip_afinfo);
}
-
-static void __exit ipv4_netfilter_fini(void)
-{
- nf_unregister_afinfo(&nf_ip_afinfo);
-}
-
-module_init(ipv4_netfilter_init);
-module_exit(ipv4_netfilter_fini);
+device_initcall(ipv4_netfilter_init);
--
1.8.4.1
The ION_DUMMY option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Colin Cross <[email protected]>
Cc: Jesse Barker <[email protected]>
Cc: Android Kernel Team <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/staging/android/ion/ion_dummy_driver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c
index 55b2002..8e7f891 100644
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@ -17,6 +17,7 @@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/init.h>
#include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/sizes.h>
@@ -128,6 +129,7 @@ err:
}
return err;
}
+device_initcall(ion_dummy_init);
static void __exit ion_dummy_exit(void)
{
@@ -152,7 +154,4 @@ static void __exit ion_dummy_exit(void)
return;
}
-
-module_init(ion_dummy_init);
-module_exit(ion_dummy_exit);
-
+__exitcall(ion_dummy_exit);
--
1.8.4.1
The HVC_OPAL/RTAS/UDBG/XEN options are all bool, and hence their support
is either present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Also the __exitcall functions have been outright deleted since
they are only ever of interest to UML, and UML will never be
using any of this code.
Cc: Richard Weinberger <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Acked-by: David Vrabel <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/tty/hvc/hvc_opal.c | 8 +-------
drivers/tty/hvc/hvc_rtas.c | 12 +-----------
drivers/tty/hvc/hvc_udbg.c | 9 +--------
drivers/tty/hvc/hvc_xen.c | 17 +----------------
4 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 6496872..b01659b 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -255,13 +255,7 @@ static int __init hvc_opal_init(void)
/* Register as a vio device to receive callbacks */
return platform_driver_register(&hvc_opal_driver);
}
-module_init(hvc_opal_init);
-
-static void __exit hvc_opal_exit(void)
-{
- platform_driver_unregister(&hvc_opal_driver);
-}
-module_exit(hvc_opal_exit);
+device_initcall(hvc_opal_init);
static void udbg_opal_putc(char c)
{
diff --git a/drivers/tty/hvc/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
index 0069bb8..08c8792 100644
--- a/drivers/tty/hvc/hvc_rtas.c
+++ b/drivers/tty/hvc/hvc_rtas.c
@@ -102,17 +102,7 @@ static int __init hvc_rtas_init(void)
return 0;
}
-module_init(hvc_rtas_init);
-
-/* This will tear down the tty portion of the driver */
-static void __exit hvc_rtas_exit(void)
-{
- /* Really the fun isn't over until the worker thread breaks down and
- * the tty cleans up */
- if (hvc_rtas_dev)
- hvc_remove(hvc_rtas_dev);
-}
-module_exit(hvc_rtas_exit);
+device_initcall(hvc_rtas_init);
/* This will happen prior to module init. There is no tty at this time? */
static int __init hvc_rtas_console_init(void)
diff --git a/drivers/tty/hvc/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
index 7222827..9cf573d 100644
--- a/drivers/tty/hvc/hvc_udbg.c
+++ b/drivers/tty/hvc/hvc_udbg.c
@@ -80,14 +80,7 @@ static int __init hvc_udbg_init(void)
return 0;
}
-module_init(hvc_udbg_init);
-
-static void __exit hvc_udbg_exit(void)
-{
- if (hvc_udbg_dev)
- hvc_remove(hvc_udbg_dev);
-}
-module_exit(hvc_udbg_exit);
+device_initcall(hvc_udbg_init);
static int __init hvc_udbg_console_init(void)
{
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 636c9ba..2dc2831 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -561,18 +561,7 @@ static int __init xen_hvc_init(void)
#endif
return r;
}
-
-static void __exit xen_hvc_fini(void)
-{
- struct xencons_info *entry, *next;
-
- if (list_empty(&xenconsoles))
- return;
-
- list_for_each_entry_safe(entry, next, &xenconsoles, list) {
- xen_console_remove(entry);
- }
-}
+device_initcall(xen_hvc_init);
static int xen_cons_init(void)
{
@@ -598,10 +587,6 @@ static int xen_cons_init(void)
hvc_instantiate(HVC_COOKIE, 0, ops);
return 0;
}
-
-
-module_init(xen_hvc_init);
-module_exit(xen_hvc_fini);
console_initcall(xen_cons_init);
#ifdef CONFIG_EARLY_PRINTK
--
1.8.4.1
The bootflag.o is obj-y (always built in). It will never be
modular, so using module_init as an alias for __initcall is
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of arch_initcall (which
makes sense for arch code) will thus change this registration
from level 6-device to level 3-arch (i.e. slightly earlier).
However no observable impact of that small difference has
been observed during testing, or is expected.
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/x86/kernel/bootflag.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/bootflag.c b/arch/x86/kernel/bootflag.c
index 5de7f4c..52c8e3c 100644
--- a/arch/x86/kernel/bootflag.c
+++ b/arch/x86/kernel/bootflag.c
@@ -98,4 +98,4 @@ static int __init sbf_init(void)
return 0;
}
-module_init(sbf_init);
+arch_initcall(sbf_init);
--
1.8.4.1
The X86_INTEL_MID option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
arch/x86/platform/intel-mid/intel_mid_vrtc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/platform/intel-mid/intel_mid_vrtc.c b/arch/x86/platform/intel-mid/intel_mid_vrtc.c
index 4762cff..d79e79a 100644
--- a/arch/x86/platform/intel-mid/intel_mid_vrtc.c
+++ b/arch/x86/platform/intel-mid/intel_mid_vrtc.c
@@ -173,5 +173,4 @@ static int __init intel_mid_device_create(void)
return platform_device_register(&vrtc_device);
}
-
-module_init(intel_mid_device_create);
+device_initcall(intel_mid_device_create);
--
1.8.4.1
The INOTIFY_USER option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of fs_initcall (which
makes sense for fs code) will thus change this registration
from level 6-device to level 5-fs (i.e. slightly earlier).
However no observable impact of that small difference has
been observed during testing, or is expected.
Cc: John McCutchan <[email protected]>
Cc: Robert Love <[email protected]>
Cc: Eric Paris <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---
fs/notify/inotify/inotify_user.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 497395c..0a23b69 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -26,7 +26,7 @@
#include <linux/fs.h> /* struct inode */
#include <linux/fsnotify_backend.h>
#include <linux/idr.h>
-#include <linux/init.h> /* module_init */
+#include <linux/init.h> /* fs_initcall */
#include <linux/inotify.h>
#include <linux/kernel.h> /* roundup() */
#include <linux/namei.h> /* LOOKUP_FOLLOW */
@@ -801,4 +801,4 @@ static int __init inotify_user_setup(void)
return 0;
}
-module_init(inotify_user_setup);
+fs_initcall(inotify_user_setup);
--
1.8.4.1
Hi Paul,
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Marcel Holtmann <[email protected]>
> Cc: Gustavo Padovan <[email protected]>
> Cc: Johan Hedberg <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/bluetooth/ath3k.c | 1 -
> drivers/bluetooth/bcm203x.c | 1 -
> drivers/bluetooth/bfusb.c | 1 -
> drivers/bluetooth/bluecard_cs.c | 1 -
> drivers/bluetooth/bpa10x.c | 1 -
> drivers/bluetooth/bt3c_cs.c | 1 -
> drivers/bluetooth/btuart_cs.c | 1 -
> drivers/bluetooth/dtl1_cs.c | 1 -
> 8 files changed, 8 deletions(-)
I can take this single patch via bluetooth-next tree or if Linus for example wants to take the whole series, then that is fine with me as well.
Acked-by: Marcel Holtmann <[email protected]>
Regards
Marcel
On 14-01-21 04:44 PM, Arnd Bergmann wrote:
> On Tuesday 21 January 2014 16:22:23 Paul Gortmaker wrote:
>>
>> Note that direct use of __initcall is discouraged, vs. one
>> of the priority categorized subgroups. As __initcall gets
>> mapped onto device_initcall, our use of subsys_initcall (which
>> seems to make sense for netfilter code) will thus change this
>> registration from level 6-device to level 4-subsys (i.e. slightly
>> earlier). However no impact of that small difference is expected.
>
> This doesn't have anything to do with netfilter. The only user
> of this driver at the moment is the highbank cpufreq driver, but
> that could change.
Thanks -- cut and paste error from an earlier, similar changeset.
Will "s/netfilter/IPC/"
Paul.
--
>
> Arnd
>
On 14-01-21 04:22 PM, Paul Gortmaker wrote:
> In powerpc, CONFIG_KVM is bool, and so are these three subarch
> options, for the 44x and e500 variants. This means that any
> module_exit() calls and functions used by them such as the
> kvmppc_booke_exit() are dead code. Here we remove them.
>
> In addition, rather than use module_init, which is just
> __initcall for non-modules, we update those as well.
>
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups. As __initcall gets
> mapped onto device_initcall, our use of subsys_initcall (which
> seems to make sense for netfilter code) will thus change this
I've fixed the above -- s/netfilter/PPC KVM/
The risks of recycling commit logs...
Paul.
--
> registration from level 6-device to level 4-subsys (i.e. slightly
> earlier).
>
> However no impact of that small difference is expected,
> since the arch independent kvm code doesn't trigger any init;
> it is the arch initcalls here which actually call kvm_init.
>
> Cc: Gleb Natapov <[email protected]>
> Cc: Paolo Bonzini <[email protected]>
> Cc: Alexander Graf <[email protected]>
> Cc: Benjamin Herrenschmidt <[email protected]>
> Cc: Paul Mackerras <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> arch/powerpc/include/asm/kvm_ppc.h | 1 -
> arch/powerpc/kvm/44x.c | 10 +---------
> arch/powerpc/kvm/booke.c | 6 ------
> arch/powerpc/kvm/e500.c | 10 +---------
> arch/powerpc/kvm/e500mc.c | 10 +---------
> 5 files changed, 3 insertions(+), 34 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
> index c8317fb..8466df5 100644
> --- a/arch/powerpc/include/asm/kvm_ppc.h
> +++ b/arch/powerpc/include/asm/kvm_ppc.h
> @@ -109,7 +109,6 @@ extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);
> extern int kvmppc_core_check_requests(struct kvm_vcpu *vcpu);
>
> extern int kvmppc_booke_init(void);
> -extern void kvmppc_booke_exit(void);
>
> extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu);
> extern int kvmppc_kvm_pv(struct kvm_vcpu *vcpu);
> diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
> index 93221e8..2129fc1 100644
> --- a/arch/powerpc/kvm/44x.c
> +++ b/arch/powerpc/kvm/44x.c
> @@ -222,12 +222,4 @@ static int __init kvmppc_44x_init(void)
> err_out:
> return r;
> }
> -
> -static void __exit kvmppc_44x_exit(void)
> -{
> - kvmppc_pr_ops = NULL;
> - kvmppc_booke_exit();
> -}
> -
> -module_init(kvmppc_44x_init);
> -module_exit(kvmppc_44x_exit);
> +subsys_initcall(kvmppc_44x_init);
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index 0591e05..49dffa2 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -1995,9 +1995,3 @@ int __init kvmppc_booke_init(void)
> #endif /* !BOOKE_HV */
> return 0;
> }
> -
> -void __exit kvmppc_booke_exit(void)
> -{
> - free_pages(kvmppc_booke_handlers, VCPU_SIZE_ORDER);
> - kvm_exit();
> -}
> diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
> index 497b142..115ef12 100644
> --- a/arch/powerpc/kvm/e500.c
> +++ b/arch/powerpc/kvm/e500.c
> @@ -564,12 +564,4 @@ static int __init kvmppc_e500_init(void)
> err_out:
> return r;
> }
> -
> -static void __exit kvmppc_e500_exit(void)
> -{
> - kvmppc_pr_ops = NULL;
> - kvmppc_booke_exit();
> -}
> -
> -module_init(kvmppc_e500_init);
> -module_exit(kvmppc_e500_exit);
> +subsys_initcall(kvmppc_e500_init);
> diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c
> index 4132cd2..612c216 100644
> --- a/arch/powerpc/kvm/e500mc.c
> +++ b/arch/powerpc/kvm/e500mc.c
> @@ -382,12 +382,4 @@ static int __init kvmppc_e500mc_init(void)
> err_out:
> return r;
> }
> -
> -static void __exit kvmppc_e500mc_exit(void)
> -{
> - kvmppc_pr_ops = NULL;
> - kvmppc_booke_exit();
> -}
> -
> -module_init(kvmppc_e500mc_init);
> -module_exit(kvmppc_e500mc_exit);
> +subsys_initcall(kvmppc_e500mc_init);
>
On 14-01-21 04:55 PM, Marcel Holtmann wrote:
> Hi Paul,
>
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> Cc: Marcel Holtmann <[email protected]>
>> Cc: Gustavo Padovan <[email protected]>
>> Cc: Johan Hedberg <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>> drivers/bluetooth/ath3k.c | 1 -
>> drivers/bluetooth/bcm203x.c | 1 -
>> drivers/bluetooth/bfusb.c | 1 -
>> drivers/bluetooth/bluecard_cs.c | 1 -
>> drivers/bluetooth/bpa10x.c | 1 -
>> drivers/bluetooth/bt3c_cs.c | 1 -
>> drivers/bluetooth/btuart_cs.c | 1 -
>> drivers/bluetooth/dtl1_cs.c | 1 -
>> 8 files changed, 8 deletions(-)
>
> I can take this single patch via bluetooth-next tree or if Linus for example wants to take the whole series, then that is fine with me as well.
>
> Acked-by: Marcel Holtmann <[email protected]>
Given that the merge window is open, and maintainers are likely to
have finalized their content, I might as well just keep it in this
series. I've added your ack though -- thanks.
Paul.
--
>
> Regards
>
> Marcel
>
On 14-01-21 04:37 PM, Guenter Roeck wrote:
> On Tue, Jan 21, 2014 at 04:22:53PM -0500, Paul Gortmaker wrote:
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> Cc: Jean Delvare <[email protected]>
>> Cc: Guenter Roeck <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>
> Hi Paul,
>
> nice cleanup. I applied it to my local repository to run
> a set of build tests with it.
Great -- sounds good, extra testing is always appreciated.
>
> Assuming the plan is to push the changes through your tree:
>
> Acked-by: Guenter Roeck <[email protected]>
Yep, that is the general plan; thanks for the ack --added.
P.
--
>
> Guenter
>
From: Paul Gortmaker <[email protected]>
Date: Tue, 21 Jan 2014 16:22:26 -0500
> The pci.o is built for SPARC64_PCI -- which is bool, and hence
> this code is either present or absent. It will never be modular,
> so using module_init as an alias for __initcall can be somewhat
> misleading.
>
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future. If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
>
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups. As __initcall gets
> mapped onto device_initcall, our use of device_initcall
> directly in this change means that the runtime impact is
> zero -- it will remain at level 6 in initcall ordering.
>
> Cc: "David S. Miller" <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
ACK
From: Paul Gortmaker <[email protected]>
Date: Tue, 21 Jan 2014 16:22:38 -0500
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: "David S. Miller" <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: David S. Miller <[email protected]>
From: Paul Gortmaker <[email protected]>
Date: Tue, 21 Jan 2014 16:22:56 -0500
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Karsten Keil <[email protected]>
> Cc: Armin Schindler <[email protected]> (maintainer:ISDN SUBSYSTEM
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: David S. Miller <[email protected]>
On Tuesday, January 21, 2014 04:23:10 PM Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Pavel Machek <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Len Brown <[email protected]>
> Cc: Mark Brown <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
> ---
> drivers/base/attribute_container.c | 1 -
> drivers/base/power/clock_ops.c | 1 -
> drivers/base/power/common.c | 1 -
> drivers/base/power/domain.c | 1 -
> drivers/base/power/domain_governor.c | 1 -
> drivers/base/power/opp.c | 1 -
> drivers/base/regmap/regmap-i2c.c | 1 -
> drivers/base/regmap/regmap-mmio.c | 1 -
> drivers/base/regmap/regmap-spi.c | 1 -
> drivers/base/topology.c | 1 -
> 10 files changed, 10 deletions(-)
>
> diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
> index ecc1929..b84ca8f 100644
> --- a/drivers/base/attribute_container.c
> +++ b/drivers/base/attribute_container.c
> @@ -12,7 +12,6 @@
> */
>
> #include <linux/attribute_container.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/kernel.h>
> #include <linux/slab.h>
> diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
> index e870bbe..b99e6c0 100644
> --- a/drivers/base/power/clock_ops.c
> +++ b/drivers/base/power/clock_ops.c
> @@ -6,7 +6,6 @@
> * This file is released under the GPLv2.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/device.h>
> #include <linux/io.h>
> diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
> index 5da9140..df2e5ee 100644
> --- a/drivers/base/power/common.c
> +++ b/drivers/base/power/common.c
> @@ -6,7 +6,6 @@
> * This file is released under the GPLv2.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/device.h>
> #include <linux/export.h>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index bfb8955..921b192 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -6,7 +6,6 @@
> * This file is released under the GPLv2.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/io.h>
> #include <linux/pm_runtime.h>
> diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
> index 28dee30..a089e3b 100644
> --- a/drivers/base/power/domain_governor.c
> +++ b/drivers/base/power/domain_governor.c
> @@ -6,7 +6,6 @@
> * This file is released under the GPLv2.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/pm_domain.h>
> #include <linux/pm_qos.h>
> diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
> index fa41874..2553867 100644
> --- a/drivers/base/power/opp.c
> +++ b/drivers/base/power/opp.c
> @@ -14,7 +14,6 @@
> #include <linux/kernel.h>
> #include <linux/errno.h>
> #include <linux/err.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/cpufreq.h>
> #include <linux/device.h>
> diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
> index fa6bf52..ebd1895 100644
> --- a/drivers/base/regmap/regmap-i2c.c
> +++ b/drivers/base/regmap/regmap-i2c.c
> @@ -13,7 +13,6 @@
> #include <linux/regmap.h>
> #include <linux/i2c.h>
> #include <linux/module.h>
> -#include <linux/init.h>
>
> static int regmap_i2c_write(void *context, const void *data, size_t count)
> {
> diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
> index 81f9775..4410cb2 100644
> --- a/drivers/base/regmap/regmap-mmio.c
> +++ b/drivers/base/regmap/regmap-mmio.c
> @@ -18,7 +18,6 @@
>
> #include <linux/clk.h>
> #include <linux/err.h>
> -#include <linux/init.h>
> #include <linux/io.h>
> #include <linux/module.h>
> #include <linux/regmap.h>
> diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
> index 37f12ae..0eb3097 100644
> --- a/drivers/base/regmap/regmap-spi.c
> +++ b/drivers/base/regmap/regmap-spi.c
> @@ -12,7 +12,6 @@
>
> #include <linux/regmap.h>
> #include <linux/spi/spi.h>
> -#include <linux/init.h>
> #include <linux/module.h>
>
> #include "internal.h"
> diff --git a/drivers/base/topology.c b/drivers/base/topology.c
> index 94ffee3..ad9d177 100644
> --- a/drivers/base/topology.c
> +++ b/drivers/base/topology.c
> @@ -23,7 +23,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> *
> */
> -#include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/cpu.h>
> #include <linux/module.h>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
On Tuesday, January 21, 2014 04:22:48 PM Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Len Brown <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Zhang Rui <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
> ---
> drivers/acpi/apei/apei-base.c | 1 -
> drivers/acpi/button.c | 1 -
> drivers/acpi/fan.c | 1 -
> drivers/acpi/hed.c | 1 -
> drivers/acpi/pci_irq.c | 1 -
> drivers/acpi/power.c | 1 -
> drivers/acpi/processor_perflib.c | 1 -
> drivers/acpi/processor_thermal.c | 1 -
> drivers/acpi/processor_throttling.c | 1 -
> drivers/acpi/utils.c | 1 -
> 10 files changed, 10 deletions(-)
>
> diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
> index 8678dfe..a83e10f 100644
> --- a/drivers/acpi/apei/apei-base.c
> +++ b/drivers/acpi/apei/apei-base.c
> @@ -32,7 +32,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/acpi.h>
> #include <linux/slab.h>
> #include <linux/io.h>
> diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
> index 11c11f6..3e20dff 100644
> --- a/drivers/acpi/button.c
> +++ b/drivers/acpi/button.c
> @@ -25,7 +25,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/proc_fs.h>
> #include <linux/seq_file.h>
> diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
> index 1fb6290..78b5cc7 100644
> --- a/drivers/acpi/fan.c
> +++ b/drivers/acpi/fan.c
> @@ -25,7 +25,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <asm/uaccess.h>
> #include <linux/thermal.h>
> diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
> index aafe3ca..215777c 100644
> --- a/drivers/acpi/hed.c
> +++ b/drivers/acpi/hed.c
> @@ -23,7 +23,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/acpi.h>
> #include <acpi/hed.h>
>
> diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
> index 52d45ea..7bd6a55 100644
> --- a/drivers/acpi/pci_irq.c
> +++ b/drivers/acpi/pci_irq.c
> @@ -30,7 +30,6 @@
> #include <linux/dmi.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/spinlock.h>
> #include <linux/pm.h>
> diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
> index ad7da68..9c909d4 100644
> --- a/drivers/acpi/power.c
> +++ b/drivers/acpi/power.c
> @@ -37,7 +37,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/slab.h>
> #include <linux/pm_runtime.h>
> diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
> index ff90054..d2594ad 100644
> --- a/drivers/acpi/processor_perflib.c
> +++ b/drivers/acpi/processor_perflib.c
> @@ -28,7 +28,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/cpufreq.h>
> #include <linux/slab.h>
> #include <linux/acpi.h>
> diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
> index e003663..661c9d2 100644
> --- a/drivers/acpi/processor_thermal.c
> +++ b/drivers/acpi/processor_thermal.c
> @@ -28,7 +28,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/cpufreq.h>
> #include <linux/acpi.h>
> #include <acpi/processor.h>
> diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
> index 28baa05..08be363 100644
> --- a/drivers/acpi/processor_throttling.c
> +++ b/drivers/acpi/processor_throttling.c
> @@ -29,7 +29,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/sched.h>
> #include <linux/cpufreq.h>
> #include <linux/acpi.h>
> diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
> index 0347a37..492cf4f 100644
> --- a/drivers/acpi/utils.c
> +++ b/drivers/acpi/utils.c
> @@ -26,7 +26,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/hardirq.h>
> #include <linux/acpi.h>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
Hi Paul,
On Tue, 2014-01-21 at 16:22 -0500, Paul Gortmaker wrote:
> Currently these two RTC devices are in core platform code
> where it is not possible for them to be modular. It will
> never be modular, so using module_init as an alias for
> __initcall can be somewhat misleading.
>
> arch/powerpc/kernel/time.c | 2 +-
> arch/powerpc/platforms/ps3/time.c | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
I tested the PS3 part of this patch and it seems to work OK.
Acked-by: Geoff Levand <[email protected]>
Paul Gortmaker <[email protected]> writes:
> Modular users will always be users of init functionality, but
> users of init functionality are not necessarily always modules.
>
> Hence any functionality like module_init and module_exit would
> be more at home in the module.h file. And module.h should
> explicitly include init.h to make the dependency clear.
>
> We've already done all the legwork needed to ensure that this
> move does not cause any build regressions due to implicit
> header file include assumptions about where module_init lives.
>
> Cc: Rusty Russell <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Rusty Russell <[email protected]>
Want to delete the extraneous semicolons, for bonus points? :)
> +#define module_init(x) __initcall(x);
...
> +#define module_exit(x) __exitcall(x);
Cheers,
Rusty.
On 01/21/2014 01:22 PM, Paul Gortmaker wrote:
> The srm console is always built in. It will never be modular,
> so using module_init as an alias for __initcall is rather
> misleading.
>
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future. If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
>
> Direct use of __initcall is discouraged, vs prioritized ones.
> Use of device_initcall is consistent with what __initcall
> maps onto, and hence does not change the init order, making the
> impact of this change zero. Should someone with real hardware
> for boot testing want to change it later to arch_initcall or
> console_initcall, they can do that at a later date.
>
> Cc: Richard Henderson <[email protected]>
> Cc: Ivan Kokshaysky <[email protected]>
> Cc: Matt Turner <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> arch/alpha/kernel/srmcons.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Reviewed-by: Richard Henderson <[email protected]>
r~
On 01/21/2014 01:22 PM, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
Acked-by: Richard Henderson <[email protected]>
r~
On 01/21/2014 04:16 PM, Rusty Russell wrote:
> Paul Gortmaker <[email protected]> writes:
>> Modular users will always be users of init functionality, but
>> users of init functionality are not necessarily always modules.
>>
>> Hence any functionality like module_init and module_exit would
>> be more at home in the module.h file. And module.h should
>> explicitly include init.h to make the dependency clear.
>>
>> We've already done all the legwork needed to ensure that this
>> move does not cause any build regressions due to implicit
>> header file include assumptions about where module_init lives.
>>
>> Cc: Rusty Russell <[email protected]>
>> Signed-off-by: Paul Gortmaker <[email protected]>
>
> Acked-by: Rusty Russell <[email protected]>
>
> Want to delete the extraneous semicolons, for bonus points? :)
>
>> +#define module_init(x) __initcall(x);
> ...
>> +#define module_exit(x) __exitcall(x);
There are still around 380 modules that use "module_init(x)" without
a trailing semi-colon. That would make lots of build errors/warnings,
I think. There was also a 2012 patch to fix those and change the
module_init() macro.
What happened there?
ISTR (maybe incorrectly) that Linus once argued for leaving the trailing
semi-colon there (perhaps 8 years ago). who knows?
--
~Randy
On Tue, Jan 21, 2014 at 7:16 PM, Rusty Russell <[email protected]> wrote:
> Paul Gortmaker <[email protected]> writes:
>> Modular users will always be users of init functionality, but
>> users of init functionality are not necessarily always modules.
>>
>> Hence any functionality like module_init and module_exit would
>> be more at home in the module.h file. And module.h should
>> explicitly include init.h to make the dependency clear.
>>
>> We've already done all the legwork needed to ensure that this
>> move does not cause any build regressions due to implicit
>> header file include assumptions about where module_init lives.
>>
>> Cc: Rusty Russell <[email protected]>
>> Signed-off-by: Paul Gortmaker <[email protected]>
>
> Acked-by: Rusty Russell <[email protected]>
>
> Want to delete the extraneous semicolons, for bonus points? :)
>
>> +#define module_init(x) __initcall(x);
I would if I could, but as I was discussing on irc with hpa about a
week ago, there are ~600 users of module_init who are relying on
that extra ";" that we need to fix 1st... :-) [on my todo list!]
Thanks for the review; much appreciated,
Paul.
--
> ...
>> +#define module_exit(x) __exitcall(x);
>
> Cheers,
> Rusty.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jan 21, 2014 at 6:48 PM, Geoff Levand <[email protected]> wrote:
> Hi Paul,
>
> On Tue, 2014-01-21 at 16:22 -0500, Paul Gortmaker wrote:
>> Currently these two RTC devices are in core platform code
>> where it is not possible for them to be modular. It will
>> never be modular, so using module_init as an alias for
>> __initcall can be somewhat misleading.
>>
>> arch/powerpc/kernel/time.c | 2 +-
>> arch/powerpc/platforms/ps3/time.c | 3 +--
>> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> I tested the PS3 part of this patch and it seems to work OK.
>
> Acked-by: Geoff Levand <[email protected]>
Thanks Geoff for the review and testing; I'll add the ack.
Paul.
--
>
> _______________________________________________
> Linuxppc-dev mailing list
> [email protected]
> https://lists.ozlabs.org/listinfo/linuxppc-dev
On 22 January 2014 02:53, Paul Gortmaker <[email protected]> wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Kevin Hilman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Viresh Kumar <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/cpufreq/omap-cpufreq.c | 1 -
> drivers/cpufreq/powernow-k8.c | 1 -
> drivers/cpufreq/s3c2412-cpufreq.c | 1 -
> drivers/cpufreq/s3c2440-cpufreq.c | 1 -
> drivers/cpufreq/spear-cpufreq.c | 1 -
> drivers/cpufreq/speedstep-lib.c | 1 -
> 6 files changed, 6 deletions(-)
We have discussed this in past where I pointed out this file is required
by stuff like module_init, what happened to that query ?
Hi Paul,
On Tue, 21 Jan 2014 16:22:03 -0500 Paul Gortmaker <[email protected]> wrote:
>
> Where: This work exists as a queue of patches that I apply to
> linux-next; since the changes are fixing some things that currently
> can only be found there. The patch series can be found at:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git
> git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git
>
> I've avoided annoying Stephen with another queue of patches for
> linux-next while the development content was in flux, but now that
> the merge window has opened, and new additions are fewer, perhaps he
> wouldn't mind tacking it on the end... Stephen?
OK, I have added this to the end of linux-next today - we will see how we
go. It is called "init".
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
[email protected]
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
On 1/21/14, Viresh Kumar <[email protected]> wrote:
> On 22 January 2014 02:53, Paul Gortmaker <[email protected]>
> wrote:
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> Cc: Kevin Hilman <[email protected]>
>> Cc: "Rafael J. Wysocki" <[email protected]>
>> Cc: Viresh Kumar <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>> drivers/cpufreq/omap-cpufreq.c | 1 -
>> drivers/cpufreq/powernow-k8.c | 1 -
>> drivers/cpufreq/s3c2412-cpufreq.c | 1 -
>> drivers/cpufreq/s3c2440-cpufreq.c | 1 -
>> drivers/cpufreq/spear-cpufreq.c | 1 -
>> drivers/cpufreq/speedstep-lib.c | 1 -
>> 6 files changed, 6 deletions(-)
>
> We have discussed this in past where I pointed out this file is required
> by stuff like module_init, what happened to that query ?
Patch 31/73 relocates module_init and similar macros to
module.h so that is no longer an implicit dependency.
https://lkml.org/lkml/2014/1/21/488
Thanks,
Paul
--
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On 1/21/14, Paul Gortmaker <[email protected]> wrote:
> The __cpuinit support was removed several releases ago. People
> have had a chance to update their out of tree code, so now we
> remove the no-op stubs.
>
> Also delete the mention of __cpuinitdata from the tag script.
>
> Cc: Andrew Morton <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> include/linux/init.h | 11 -----------
> scripts/tags.sh | 2 +-
> 2 files changed, 1 insertion(+), 12 deletions(-)
> mode change 100755 => 100644 scripts
Odd. I definitely did not chmod -x this file manually.
Wonder how that happened? Will fix...
Paul.
--
>
> diff --git a/include/linux/init.h b/include/linux/init.h
> index e168880..f693cc3 100644
> --- a/include/linux/init.h
> +++ b/include/linux/init.h
> @@ -91,14 +91,6 @@
>
> #define __exit __section(.exit.text) __exitused __cold notrace
>
> -/* temporary, until all users are removed */
> -#define __cpuinit
> -#define __cpuinitdata
> -#define __cpuinitconst
> -#define __cpuexit
> -#define __cpuexitdata
> -#define __cpuexitconst
> -
> /* Used for MEMORY_HOTPLUG */
> #define __meminit __section(.meminit.text) __cold notrace
> #define __meminitdata __section(.meminit.data)
> @@ -116,9 +108,6 @@
> #define __INITRODATA .section ".init.rodata","a",%progbits
> #define __FINITDATA .previous
>
> -/* temporary, until all users are removed */
> -#define __CPUINIT
> -
> #define __MEMINIT .section ".meminit.text", "ax"
> #define __MEMINITDATA .section ".meminit.data", "aw"
> #define __MEMINITRODATA .section ".meminit.rodata", "a"
> diff --git a/scripts/tags.sh b/scripts/tags.sh
> old mode 100755
> new mode 100644
> index 58c4559..78382c2
> --- a/scripts/tags.sh
> +++ b/scripts/tags.sh
> @@ -150,7 +150,7 @@ exuberant()
> {
> all_target_sources | xargs $1 -a \
> -I __initdata,__exitdata,__initconst, \
> - -I __cpuinitdata,__initdata_memblock \
> + -I __initdata_memblock \
> -I __refdata,__attribute,__maybe_unused,__always_unused \
> -I __acquires,__releases,__deprecated \
> -I __read_mostly,__aligned,____cacheline_aligned \
> --
> 1.8.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Tue, Jan 21, 2014 at 04:23:08PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Doug Thompson <[email protected]>
> Cc: Borislav Petkov <[email protected]>
> Cc: Ralf Baechle <[email protected]>
> Cc: David Daney <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Borislav Petkov <[email protected]>
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
[Re: [PATCH RFC 00/73] tree-wide: clean up some no longer required #include <linux/init.h>] On 22/01/2014 (Wed 18:00) Stephen Rothwell wrote:
> Hi Paul,
>
> On Tue, 21 Jan 2014 16:22:03 -0500 Paul Gortmaker <[email protected]> wrote:
> >
> > Where: This work exists as a queue of patches that I apply to
> > linux-next; since the changes are fixing some things that currently
> > can only be found there. The patch series can be found at:
> >
> > http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git
> > git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git
> >
> > I've avoided annoying Stephen with another queue of patches for
> > linux-next while the development content was in flux, but now that
> > the merge window has opened, and new additions are fewer, perhaps he
> > wouldn't mind tacking it on the end... Stephen?
>
> OK, I have added this to the end of linux-next today - we will see how we
> go. It is called "init".
Thanks, it was a great help as it uncovered a few issues in fringe arch
that I didn't have toolchains for, and I've fixed all of those up.
I've noticed that powerpc has been un-buildable for a while now; I have
used this hack patch locally so I could run the ppc defconfigs to check
that I didn't break anything. Maybe useful for linux-next in the
interim? It is a hack patch -- Not-Signed-off-by: Paul Gortmaker. :)
Paul.
--
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index d27960c89a71..d0f070a2b395 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -560,9 +560,9 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
pmd_t *pmdp);
#define pmd_move_must_withdraw pmd_move_must_withdraw
-typedef struct spinlock spinlock_t;
-static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl,
- spinlock_t *old_pmd_ptl)
+struct spinlock;
+static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
+ struct spinlock *old_pmd_ptl)
{
/*
* Archs like ppc64 use pgtable to store per pmd
On Tue, Jan 21, 2014 at 10:22 PM, Paul Gortmaker
<[email protected]> wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Linus Walleij <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Patch applied for v3.15.
Yours,
Linus Walleij
On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker
<[email protected]> wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Linus Walleij <[email protected]>
> Cc: Alexandre Courbot <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Patch applied for v3.15.
Yours,
Linus Walleij
On Tue, Jan 21, 2014 at 04:22:22PM -0500, Paul Gortmaker wrote:
> Despite the name mach-crag6410-module.c, the code is built for
> MACH_WLF_CRAGG_6410 -- which is bool, and hence this code is
> either present or absent. It will never be modular, so using
> module_init as an alias for __initcall can be somewhat
> misleading.
>
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future. If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
>
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups. As __initcall gets
> mapped onto device_initcall, our use of device_initcall
> directly in this change means that the runtime impact is
> zero -- it will remain at level 6 in initcall ordering.
>
> Cc: Ben Dooks <[email protected]>
> Cc: Kukjin Kim <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
Tested-by: Charles Keepax <[email protected]>
Thanks,
Charles
Hi Paul,
On Tue, 21 Jan 2014 16:22:53 -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Jean Delvare <[email protected]>
> Cc: Guenter Roeck <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> (...)
Looks good to me, and thanks for doing that.
Acked-by: Jean Delvare <[email protected]>
--
Jean Delvare
Hi Linus,
On Thu, 23 Jan 2014 09:12:43 +0100 Linus Walleij <[email protected]> wrote:
>
> On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker <[email protected]> wrote:
>
> > None of these files are actually using any __init type directives
> > and hence don't need to include <linux/init.h>. Most are just a
> > left over from __devinit and __cpuinit removal, or simply due to
> > code getting copied from one driver to the next.
> >
> > Cc: Linus Walleij <[email protected]>
> > Cc: Alexandre Courbot <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Paul Gortmaker <[email protected]>
>
> Patch applied for v3.15.
Yet that patch is in linux-next today. And just 2 days ago I mailed out this request (as I do during each merge window):
"Please do not add any code intended for v3.15 to your linux-next included
trees until after v3.14-rc1 has been released."
I have no problem with that particular patch being sent to Linus during
this merge window (in fact Paul intends to send whatever is left of the
series at the end of the merge window), but it makes me wonder about the
other commits that you have added to the gpio tree (and the pinctrl tree)
today. Are they intended for this merge window or v3.15?
--
Cheers,
Stephen Rothwell [email protected]
[Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>] On 24/01/2014 (Fri 09:58) Stephen Rothwell wrote:
> Hi Linus,
>
> On Thu, 23 Jan 2014 09:12:43 +0100 Linus Walleij <[email protected]> wrote:
> >
> > On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker <[email protected]> wrote:
> >
> > > None of these files are actually using any __init type directives
> > > and hence don't need to include <linux/init.h>. Most are just a
> > > left over from __devinit and __cpuinit removal, or simply due to
> > > code getting copied from one driver to the next.
> > >
> > > Cc: Linus Walleij <[email protected]>
> > > Cc: Alexandre Courbot <[email protected]>
> > > Cc: [email protected]
> > > Signed-off-by: Paul Gortmaker <[email protected]>
> >
> > Patch applied for v3.15.
>
> Yet that patch is in linux-next today. And just 2 days ago I mailed out this request (as I do during each merge window):
>
> "Please do not add any code intended for v3.15 to your linux-next included
> trees until after v3.14-rc1 has been released."
>
> I have no problem with that particular patch being sent to Linus during
> this merge window (in fact Paul intends to send whatever is left of the
> series at the end of the merge window), but it makes me wonder about the
> other commits that you have added to the gpio tree (and the pinctrl tree)
> today. Are they intended for this merge window or v3.15?
For what it is worth, I'm not removing any patches from my series file
until they explicitly conflict and/or become redundant. If a maintainer
says they are adding the patch, I add a comment in the series file, but
I don't remove them until I see them come into next via another branch,
and/or sfr reports a conflict/redundancy.
Thanks,
Paul.
--
> --
> Cheers,
> Stephen Rothwell [email protected]
On Thu, Jan 23, 2014 at 11:58 PM, Stephen Rothwell <[email protected]> wrote:
> I have no problem with that particular patch being sent to Linus during
> this merge window (in fact Paul intends to send whatever is left of the
> series at the end of the merge window), but it makes me wonder about the
> other commits that you have added to the gpio tree (and the pinctrl tree)
> today. Are they intended for this merge window or v3.15?
Sorry, my bad. I took this out now and I have a much smaller/stricter
subset of patches in for-next today.
Yours,
Linus Walleij
Hi Paul,
On Tue, 21 Jan 2014 16:22:54 -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Wolfram Sang <[email protected]>
> Cc: Jean Delvare <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/i2c/algos/i2c-algo-bit.c | 1 -
> drivers/i2c/algos/i2c-algo-pca.c | 1 -
> drivers/i2c/algos/i2c-algo-pcf.c | 1 -
> drivers/i2c/busses/i2c-ali1535.c | 1 -
> drivers/i2c/busses/i2c-ali1563.c | 1 -
> drivers/i2c/busses/i2c-ali15x3.c | 1 -
> drivers/i2c/busses/i2c-amd756.c | 1 -
> drivers/i2c/busses/i2c-amd8111.c | 1 -
> drivers/i2c/busses/i2c-au1550.c | 1 -
> drivers/i2c/busses/i2c-cbus-gpio.c | 1 -
> drivers/i2c/busses/i2c-cpm.c | 1 -
> drivers/i2c/busses/i2c-eg20t.c | 1 -
> drivers/i2c/busses/i2c-exynos5.c | 1 -
> drivers/i2c/busses/i2c-highlander.c | 1 -
> drivers/i2c/busses/i2c-hydra.c | 1 -
> drivers/i2c/busses/i2c-ibm_iic.c | 1 -
> drivers/i2c/busses/i2c-iop3xx.c | 1 -
> drivers/i2c/busses/i2c-isch.c | 1 -
> drivers/i2c/busses/i2c-ismt.c | 1 -
> drivers/i2c/busses/i2c-mpc.c | 1 -
> drivers/i2c/busses/i2c-nforce2.c | 1 -
> drivers/i2c/busses/i2c-ocores.c | 1 -
> drivers/i2c/busses/i2c-octeon.c | 1 -
> drivers/i2c/busses/i2c-pca-platform.c | 1 -
> drivers/i2c/busses/i2c-piix4.c | 1 -
> drivers/i2c/busses/i2c-pmcmsp.c | 1 -
> drivers/i2c/busses/i2c-powermac.c | 1 -
> drivers/i2c/busses/i2c-puv3.c | 1 -
> drivers/i2c/busses/i2c-rcar.c | 1 -
> drivers/i2c/busses/i2c-scmi.c | 1 -
> drivers/i2c/busses/i2c-sh7760.c | 1 -
> drivers/i2c/busses/i2c-simtec.c | 1 -
> drivers/i2c/busses/i2c-sis630.c | 1 -
> drivers/i2c/busses/i2c-sis96x.c | 1 -
> drivers/i2c/busses/i2c-via.c | 1 -
> drivers/i2c/busses/i2c-xiic.c | 1 -
> drivers/i2c/busses/i2c-xlr.c | 1 -
> drivers/i2c/busses/scx200_i2c.c | 1 -
> drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 1 -
> drivers/i2c/muxes/i2c-mux-gpio.c | 1 -
> drivers/i2c/muxes/i2c-mux-pca9541.c | 1 -
> drivers/i2c/muxes/i2c-mux-pca954x.c | 1 -
> drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 -
> 43 files changed, 43 deletions(-)
> (...)
Looks good to me, thanks for doing this.
Acked-by: Jean Delvare <[email protected]>
--
Jean Delvare
On Tue, Jan 21, 2014 at 04:22:33PM -0500, Paul Gortmaker wrote:
> This file is controlled by a tristate Kconfig option, and hence
> needs to include module.h so that it can get module_init() once
> we relocate it from init.h into module.h in the future.
>
> Note that module_exit() appears to be missing from the driver, so
> it is questionable whether it would actually work for a removal
> and reload cycle if it was configured for a modular build.
>
> Cc: Wolfram Sang <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Applied to for-current, thanks!
On Tue, Jan 21, 2014 at 04:22:54PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Wolfram Sang <[email protected]>
> Cc: Jean Delvare <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Applied to for-current, thanks!
On Wed, 2014-01-22 at 19:38 -0500, Paul Gortmaker wrote:
> Thanks, it was a great help as it uncovered a few issues in fringe arch
> that I didn't have toolchains for, and I've fixed all of those up.
>
> I've noticed that powerpc has been un-buildable for a while now; I have
> used this hack patch locally so I could run the ppc defconfigs to check
> that I didn't break anything. Maybe useful for linux-next in the
> interim? It is a hack patch -- Not-Signed-off-by: Paul Gortmaker. :)
Can you and/or Aneesh submit that as a proper patch (with S-O-B
etc...) ?
Thanks !
Cheers,
Ben.
> Paul.
> --
>
> diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
> index d27960c89a71..d0f070a2b395 100644
> --- a/arch/powerpc/include/asm/pgtable-ppc64.h
> +++ b/arch/powerpc/include/asm/pgtable-ppc64.h
> @@ -560,9 +560,9 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
> pmd_t *pmdp);
>
> #define pmd_move_must_withdraw pmd_move_must_withdraw
> -typedef struct spinlock spinlock_t;
> -static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl,
> - spinlock_t *old_pmd_ptl)
> +struct spinlock;
> +static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
> + struct spinlock *old_pmd_ptl)
> {
> /*
> * Archs like ppc64 use pgtable to store per pmd
>
> _______________________________________________
> Linuxppc-dev mailing list
> [email protected]
> https://lists.ozlabs.org/listinfo/linuxppc-dev
On 14-01-27 10:13 PM, Benjamin Herrenschmidt wrote:
> On Wed, 2014-01-22 at 19:38 -0500, Paul Gortmaker wrote:
>
>> Thanks, it was a great help as it uncovered a few issues in fringe arch
>> that I didn't have toolchains for, and I've fixed all of those up.
>>
>> I've noticed that powerpc has been un-buildable for a while now; I have
>> used this hack patch locally so I could run the ppc defconfigs to check
>> that I didn't break anything. Maybe useful for linux-next in the
>> interim? It is a hack patch -- Not-Signed-off-by: Paul Gortmaker. :)
>
> Can you and/or Aneesh submit that as a proper patch (with S-O-B
> etc...) ?
I'd updated toolchains and didn't realize it was still broken. Patch sent.
http://patchwork.ozlabs.org/patch/314749/
Paul.
--
>
> Thanks !
>
> Cheers,
> Ben.
>
>> Paul.
>> --
>>
>> diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
>> index d27960c89a71..d0f070a2b395 100644
>> --- a/arch/powerpc/include/asm/pgtable-ppc64.h
>> +++ b/arch/powerpc/include/asm/pgtable-ppc64.h
>> @@ -560,9 +560,9 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
>> pmd_t *pmdp);
>>
>> #define pmd_move_must_withdraw pmd_move_must_withdraw
>> -typedef struct spinlock spinlock_t;
>> -static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl,
>> - spinlock_t *old_pmd_ptl)
>> +struct spinlock;
>> +static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
>> + struct spinlock *old_pmd_ptl)
>> {
>> /*
>> * Archs like ppc64 use pgtable to store per pmd
>>
>> _______________________________________________
>> Linuxppc-dev mailing list
>> [email protected]
>> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
>
On Tue, Jan 21, 2014 at 04:22:52PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: David Woodhouse <[email protected]>
> Cc: Brian Norris <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
> index 8fc06bf..3428034e 100644
> --- a/drivers/mtd/maps/sa1100-flash.c
> +++ b/drivers/mtd/maps/sa1100-flash.c
> @@ -7,7 +7,6 @@
> #include <linux/types.h>
> #include <linux/ioport.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/errno.h>
> #include <linux/slab.h>
> #include <linux/platform_device.h>
This file uses __exit_p(), from <linux/init.h>. So I dropped this hunk
and pushed the rest to l2-mtd.git/next.
Thanks,
Brian
On 14-01-28 07:02 PM, Brian Norris wrote:
> On Tue, Jan 21, 2014 at 04:22:52PM -0500, Paul Gortmaker wrote:
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> Cc: David Woodhouse <[email protected]>
>> Cc: Brian Norris <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>
>> diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
>> index 8fc06bf..3428034e 100644
>> --- a/drivers/mtd/maps/sa1100-flash.c
>> +++ b/drivers/mtd/maps/sa1100-flash.c
>> @@ -7,7 +7,6 @@
>> #include <linux/types.h>
>> #include <linux/ioport.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/errno.h>
>> #include <linux/slab.h>
>> #include <linux/platform_device.h>
>
> This file uses __exit_p(), from <linux/init.h>. So I dropped this hunk
> and pushed the rest to l2-mtd.git/next.
Thanks! Not sure why that got caught up in the review, since I had __exit
in my regex filter. It had module.h so I never caught the false positive in
my build testing either.
Paul.
--
>
> Thanks,
> Brian
>
Quoting Paul Gortmaker (2014-01-21 13:22:30)
> The clk-nomadik.o is built for ARCH_NOMADIK -- which is bool, and
> hence this code is either present or absent. It will never be
> modular, so using module_init as an alias for __initcall can be
> somewhat misleading.
>
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future. If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
>
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups. As __initcall gets
> mapped onto device_initcall, our use of device_initcall
> directly in this change means that the runtime impact is
> zero -- it will remain at level 6 in initcall ordering.
>
> Cc: Mike Turquette <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Looks good to me.
Regards,
Mike
> ---
> drivers/clk/clk-nomadik.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
> index 6a934a5..5be9b9f 100644
> --- a/drivers/clk/clk-nomadik.c
> +++ b/drivers/clk/clk-nomadik.c
> @@ -500,8 +500,7 @@ static int __init nomadik_src_clk_init_debugfs(void)
> NULL, NULL, &nomadik_src_clk_debugfs_ops);
> return 0;
> }
> -
> -module_init(nomadik_src_clk_init_debugfs);
> +device_initcall(nomadik_src_clk_init_debugfs);
>
> #endif
>
> --
> 1.8.4.1
>
Em Tue, 21 Jan 2014 16:22:50 -0500
Paul Gortmaker <[email protected]> escreveu:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
Actually, one of the drivers is using it:
drivers/media/usb/em28xx/em28xx-video.c:static int __init em28xx_video_register(void)
Probably due to a recent patch for 3.14-rc1 that converted em28xx-video
into a module.
Could you please rebase it, removing __init/__exit rom em28xx-video
and resend this one for me to merge on my tree?
Thanks!
Mauro
>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/media/common/btcx-risc.c | 1 -
> drivers/media/common/cx2341x.c | 1 -
> drivers/media/common/siano/smsdvb-debugfs.c | 1 -
> drivers/media/common/tveeprom.c | 1 -
> drivers/media/dvb-frontends/au8522_dig.c | 1 -
> drivers/media/dvb-frontends/au8522_priv.h | 1 -
> drivers/media/dvb-frontends/bcm3510.c | 1 -
> drivers/media/dvb-frontends/cx22700.c | 1 -
> drivers/media/dvb-frontends/cx22702.c | 1 -
> drivers/media/dvb-frontends/cx24110.c | 1 -
> drivers/media/dvb-frontends/cx24113.c | 1 -
> drivers/media/dvb-frontends/cx24116.c | 1 -
> drivers/media/dvb-frontends/cx24117.c | 1 -
> drivers/media/dvb-frontends/cx24123.c | 1 -
> drivers/media/dvb-frontends/dib3000mb.c | 1 -
> drivers/media/dvb-frontends/drxd_hard.c | 1 -
> drivers/media/dvb-frontends/drxk_hard.c | 1 -
> drivers/media/dvb-frontends/ds3000.c | 1 -
> drivers/media/dvb-frontends/dvb_dummy_fe.c | 1 -
> drivers/media/dvb-frontends/isl6405.c | 1 -
> drivers/media/dvb-frontends/isl6421.c | 1 -
> drivers/media/dvb-frontends/isl6423.c | 1 -
> drivers/media/dvb-frontends/it913x-fe.c | 1 -
> drivers/media/dvb-frontends/l64781.c | 1 -
> drivers/media/dvb-frontends/lgdt330x.c | 1 -
> drivers/media/dvb-frontends/lgs8gl5.c | 1 -
> drivers/media/dvb-frontends/lnbp21.c | 1 -
> drivers/media/dvb-frontends/lnbp22.c | 1 -
> drivers/media/dvb-frontends/m88rs2000.c | 1 -
> drivers/media/dvb-frontends/mb86a16.c | 1 -
> drivers/media/dvb-frontends/mt312.c | 1 -
> drivers/media/dvb-frontends/mt352.c | 1 -
> drivers/media/dvb-frontends/nxt200x.c | 1 -
> drivers/media/dvb-frontends/nxt6000.c | 1 -
> drivers/media/dvb-frontends/or51132.c | 1 -
> drivers/media/dvb-frontends/s5h1409.c | 1 -
> drivers/media/dvb-frontends/s5h1411.c | 1 -
> drivers/media/dvb-frontends/s5h1420.c | 1 -
> drivers/media/dvb-frontends/s5h1432.c | 1 -
> drivers/media/dvb-frontends/si21xx.c | 1 -
> drivers/media/dvb-frontends/sp8870.c | 1 -
> drivers/media/dvb-frontends/sp887x.c | 1 -
> drivers/media/dvb-frontends/stb0899_drv.c | 1 -
> drivers/media/dvb-frontends/stb6100.c | 1 -
> drivers/media/dvb-frontends/stv0288.c | 1 -
> drivers/media/dvb-frontends/stv0297.c | 1 -
> drivers/media/dvb-frontends/stv0299.c | 1 -
> drivers/media/dvb-frontends/stv090x.c | 1 -
> drivers/media/dvb-frontends/stv6110x.c | 1 -
> drivers/media/dvb-frontends/tda10021.c | 1 -
> drivers/media/dvb-frontends/tda10023.c | 1 -
> drivers/media/dvb-frontends/tda10048.c | 1 -
> drivers/media/dvb-frontends/tda1004x.c | 1 -
> drivers/media/dvb-frontends/tda10086.c | 1 -
> drivers/media/dvb-frontends/tda18271c2dd.c | 1 -
> drivers/media/dvb-frontends/tda665x.c | 1 -
> drivers/media/dvb-frontends/tda8083.c | 1 -
> drivers/media/dvb-frontends/tda8261.c | 1 -
> drivers/media/dvb-frontends/ves1820.c | 1 -
> drivers/media/dvb-frontends/ves1x93.c | 1 -
> drivers/media/dvb-frontends/zl10039.c | 1 -
> drivers/media/dvb-frontends/zl10353.c | 1 -
> drivers/media/i2c/adv7180.c | 1 -
> drivers/media/i2c/adv7183.c | 1 -
> drivers/media/i2c/adv7343.c | 1 -
> drivers/media/i2c/adv7393.c | 1 -
> drivers/media/i2c/ak881x.c | 1 -
> drivers/media/i2c/ir-kbd-i2c.c | 1 -
> drivers/media/i2c/ks0127.c | 1 -
> drivers/media/i2c/ml86v7667.c | 1 -
> drivers/media/i2c/mt9m032.c | 1 -
> drivers/media/i2c/ov7640.c | 1 -
> drivers/media/i2c/ov7670.c | 1 -
> drivers/media/i2c/s5c73m3/s5c73m3-core.c | 1 -
> drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 -
> drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
> drivers/media/i2c/saa6588.c | 1 -
> drivers/media/i2c/saa6752hs.c | 1 -
> drivers/media/i2c/saa7110.c | 1 -
> drivers/media/i2c/saa7191.c | 1 -
> drivers/media/i2c/soc_camera/mt9t112.c | 1 -
> drivers/media/i2c/soc_camera/ov2640.c | 1 -
> drivers/media/i2c/soc_camera/ov772x.c | 1 -
> drivers/media/i2c/soc_camera/ov9640.c | 1 -
> drivers/media/i2c/soc_camera/ov9740.c | 1 -
> drivers/media/i2c/soc_camera/tw9910.c | 1 -
> drivers/media/i2c/sony-btf-mpx.c | 1 -
> drivers/media/i2c/tda7432.c | 1 -
> drivers/media/i2c/tvaudio.c | 1 -
> drivers/media/i2c/tw2804.c | 1 -
> drivers/media/i2c/tw9903.c | 1 -
> drivers/media/i2c/tw9906.c | 1 -
> drivers/media/i2c/uda1342.c | 1 -
> drivers/media/i2c/vpx3220.c | 1 -
> drivers/media/i2c/vs6624.c | 1 -
> drivers/media/pci/bt8xx/bttv-gpio.c | 1 -
> drivers/media/pci/bt8xx/bttv-i2c.c | 1 -
> drivers/media/pci/bt8xx/bttv-if.c | 1 -
> drivers/media/pci/bt8xx/bttv-input.c | 1 -
> drivers/media/pci/bt8xx/bttv-risc.c | 1 -
> drivers/media/pci/bt8xx/dst.c | 1 -
> drivers/media/pci/bt8xx/dst_ca.c | 1 -
> drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 -
> drivers/media/pci/cx18/cx18-driver.h | 1 -
> drivers/media/pci/cx23885/cx23885-417.c | 1 -
> drivers/media/pci/cx23885/cx23885-alsa.c | 1 -
> drivers/media/pci/cx23885/cx23885-cards.c | 1 -
> drivers/media/pci/cx23885/cx23885-dvb.c | 1 -
> drivers/media/pci/cx23885/cx23885-i2c.c | 1 -
> drivers/media/pci/cx23885/cx23885-vbi.c | 1 -
> drivers/media/pci/cx23885/cx23885-video.c | 1 -
> drivers/media/pci/cx25821/cx25821-alsa.c | 1 -
> drivers/media/pci/cx25821/cx25821-audio-upstream.c | 1 -
> drivers/media/pci/cx25821/cx25821-cards.c | 1 -
> drivers/media/pci/cx25821/cx25821-video-upstream.c | 1 -
> drivers/media/pci/cx25821/cx25821-video.h | 1 -
> drivers/media/pci/cx88/cx88-alsa.c | 1 -
> drivers/media/pci/cx88/cx88-cards.c | 1 -
> drivers/media/pci/cx88/cx88-core.c | 1 -
> drivers/media/pci/cx88/cx88-i2c.c | 1 -
> drivers/media/pci/cx88/cx88-input.c | 1 -
> drivers/media/pci/cx88/cx88-mpeg.c | 1 -
> drivers/media/pci/cx88/cx88-tvaudio.c | 1 -
> drivers/media/pci/cx88/cx88-vbi.c | 1 -
> drivers/media/pci/cx88/cx88-video.c | 1 -
> drivers/media/pci/cx88/cx88-vp3054-i2c.c | 1 -
> drivers/media/pci/dm1105/dm1105.c | 1 -
> drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 1 -
> drivers/media/pci/ivtv/ivtv-driver.h | 1 -
> drivers/media/pci/mantis/mantis_pci.c | 1 -
> drivers/media/pci/ngene/ngene-core.c | 1 -
> drivers/media/pci/ngene/ngene-dvb.c | 1 -
> drivers/media/pci/ngene/ngene-i2c.c | 1 -
> drivers/media/pci/pluto2/pluto2.c | 1 -
> drivers/media/pci/saa7134/saa7134-alsa.c | 1 -
> drivers/media/pci/saa7134/saa7134-cards.c | 1 -
> drivers/media/pci/saa7134/saa7134-i2c.c | 1 -
> drivers/media/pci/saa7134/saa7134-input.c | 1 -
> drivers/media/pci/saa7134/saa7134-ts.c | 1 -
> drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 -
> drivers/media/pci/saa7134/saa7134-vbi.c | 1 -
> drivers/media/pci/saa7134/saa7134-video.c | 1 -
> drivers/media/pci/saa7164/saa7164-cards.c | 1 -
> drivers/media/pci/saa7164/saa7164-i2c.c | 1 -
> drivers/media/pci/ttpci/av7110_ir.c | 1 -
> drivers/media/pci/ttpci/ttpci-eeprom.c | 1 -
> drivers/media/pci/zoran/zoran_driver.c | 1 -
> drivers/media/platform/blackfin/bfin_capture.c | 1 -
> drivers/media/platform/davinci/vpbe.c | 1 -
> drivers/media/platform/davinci/vpbe_display.c | 1 -
> drivers/media/platform/davinci/vpbe_venc.c | 1 -
> drivers/media/platform/davinci/vpfe_capture.c | 1 -
> drivers/media/platform/fsl-viu.c | 1 -
> drivers/media/platform/indycam.c | 1 -
> drivers/media/platform/sh_vou.c | 1 -
> drivers/media/platform/soc_camera/atmel-isi.c | 1 -
> drivers/media/platform/soc_camera/mx2_camera.c | 1 -
> drivers/media/platform/soc_camera/mx3_camera.c | 1 -
> drivers/media/platform/soc_camera/pxa_camera.c | 1 -
> drivers/media/platform/soc_camera/soc_camera.c | 1 -
> drivers/media/platform/soc_camera/soc_camera_platform.c | 1 -
> drivers/media/radio/dsbr100.c | 1 -
> drivers/media/radio/radio-isa.c | 1 -
> drivers/media/radio/radio-ma901.c | 1 -
> drivers/media/radio/radio-maxiradio.c | 1 -
> drivers/media/radio/radio-mr800.c | 1 -
> drivers/media/radio/radio-raremono.c | 1 -
> drivers/media/radio/radio-shark.c | 1 -
> drivers/media/radio/radio-shark2.c | 1 -
> drivers/media/radio/radio-tea5764.c | 1 -
> drivers/media/radio/radio-tea5777.c | 1 -
> drivers/media/radio/saa7706h.c | 1 -
> drivers/media/radio/si470x/radio-si470x.h | 1 -
> drivers/media/radio/si4713/radio-platform-si4713.c | 1 -
> drivers/media/radio/si4713/radio-usb-si4713.c | 1 -
> drivers/media/radio/tef6862.c | 1 -
> drivers/media/rc/ati_remote.c | 1 -
> drivers/media/rc/gpio-ir-recv.c | 1 -
> drivers/media/rc/imon.c | 1 -
> drivers/media/tuners/mt2063.c | 1 -
> drivers/media/tuners/mxl5005s.c | 1 -
> drivers/media/tuners/tda9887.c | 1 -
> drivers/media/usb/au0828/au0828-dvb.c | 1 -
> drivers/media/usb/au0828/au0828-i2c.c | 1 -
> drivers/media/usb/au0828/au0828-vbi.c | 1 -
> drivers/media/usb/au0828/au0828-video.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-417.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-cards.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-core.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 1 -
> drivers/media/usb/cx231xx/cx231xx-vbi.c | 1 -
> drivers/media/usb/cx231xx/cx231xx-video.c | 1 -
> drivers/media/usb/dvb-usb/friio-fe.c | 1 -
> drivers/media/usb/em28xx/em28xx-cards.c | 1 -
> drivers/media/usb/em28xx/em28xx-core.c | 1 -
> drivers/media/usb/em28xx/em28xx-vbi.c | 1 -
> drivers/media/usb/em28xx/em28xx-video.c | 1 -
> drivers/media/usb/hdpvr/hdpvr-control.c | 1 -
> drivers/media/usb/hdpvr/hdpvr-core.c | 1 -
> drivers/media/usb/hdpvr/hdpvr-video.c | 1 -
> drivers/media/usb/pwc/pwc-if.c | 1 -
> drivers/media/usb/pwc/pwc-v4l.c | 1 -
> drivers/media/usb/siano/smsusb.c | 1 -
> drivers/media/usb/stk1160/stk1160-core.c | 1 -
> drivers/media/usb/stkwebcam/stk-webcam.c | 1 -
> drivers/media/usb/tlg2300/pd-alsa.c | 1 -
> drivers/media/usb/tlg2300/pd-radio.c | 1 -
> drivers/media/usb/tm6000/tm6000-cards.c | 1 -
> drivers/media/usb/tm6000/tm6000-input.c | 1 -
> drivers/media/usb/tm6000/tm6000-video.c | 1 -
> drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 1 -
> drivers/media/usb/ttusb-dec/ttusb_dec.c | 1 -
> drivers/media/usb/usbtv/usbtv.c | 1 -
> drivers/media/usb/usbvision/usbvision-core.c | 1 -
> drivers/media/usb/usbvision/usbvision-i2c.c | 1 -
> drivers/media/usb/zr364xx/zr364xx.c | 1 -
> drivers/media/v4l2-core/tuner-core.c | 1 -
> drivers/media/v4l2-core/videobuf-core.c | 1 -
> drivers/media/v4l2-core/videobuf-dma-contig.c | 1 -
> drivers/media/v4l2-core/videobuf-dma-sg.c | 1 -
> drivers/media/v4l2-core/videobuf-dvb.c | 1 -
> drivers/media/v4l2-core/videobuf-vmalloc.c | 1 -
> 223 files changed, 223 deletions(-)
>
> diff --git a/drivers/media/common/btcx-risc.c b/drivers/media/common/btcx-risc.c
> index ac1b268..c39610e 100644
> --- a/drivers/media/common/btcx-risc.c
> +++ b/drivers/media/common/btcx-risc.c
> @@ -23,7 +23,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/pci.h>
> #include <linux/interrupt.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c
> index 103ef6b..7639f5a 100644
> --- a/drivers/media/common/cx2341x.c
> +++ b/drivers/media/common/cx2341x.c
> @@ -22,7 +22,6 @@
> #include <linux/module.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/videodev2.h>
>
> diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c
> index 0bb4430..88fc961 100644
> --- a/drivers/media/common/siano/smsdvb-debugfs.c
> +++ b/drivers/media/common/siano/smsdvb-debugfs.c
> @@ -21,7 +21,6 @@
>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/debugfs.h>
> #include <linux/spinlock.h>
> #include <linux/usb.h>
> diff --git a/drivers/media/common/tveeprom.c b/drivers/media/common/tveeprom.c
> index c7dace6..7e94981 100644
> --- a/drivers/media/common/tveeprom.c
> +++ b/drivers/media/common/tveeprom.c
> @@ -32,7 +32,6 @@
> #include <linux/module.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/videodev2.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
> index a68974f..9b9c71c 100644
> --- a/drivers/media/dvb-frontends/au8522_dig.c
> +++ b/drivers/media/dvb-frontends/au8522_dig.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/dvb-frontends/au8522_priv.h b/drivers/media/dvb-frontends/au8522_priv.h
> index aa0f16d..190d447 100644
> --- a/drivers/media/dvb-frontends/au8522_priv.h
> +++ b/drivers/media/dvb-frontends/au8522_priv.h
> @@ -22,7 +22,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
> index 39a29dd..1ebb46b 100644
> --- a/drivers/media/dvb-frontends/bcm3510.c
> +++ b/drivers/media/dvb-frontends/bcm3510.c
> @@ -31,7 +31,6 @@
> * Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/firmware.h>
> diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
> index 3d399d9..1f4031a 100644
> --- a/drivers/media/dvb-frontends/cx22700.c
> +++ b/drivers/media/dvb-frontends/cx22700.c
> @@ -21,7 +21,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
> index edc8eaf..7d6ce32 100644
> --- a/drivers/media/dvb-frontends/cx22702.c
> +++ b/drivers/media/dvb-frontends/cx22702.c
> @@ -26,7 +26,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
> index 95b981c..72f898e 100644
> --- a/drivers/media/dvb-frontends/cx24110.c
> +++ b/drivers/media/dvb-frontends/cx24110.c
> @@ -25,7 +25,6 @@
> #include <linux/slab.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
>
> #include "dvb_frontend.h"
> #include "cx24110.h"
> diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
> index 3883c3b..b7190a3 100644
> --- a/drivers/media/dvb-frontends/cx24113.c
> +++ b/drivers/media/dvb-frontends/cx24113.c
> @@ -24,7 +24,6 @@
> #include <linux/slab.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
>
> #include "dvb_frontend.h"
> #include "cx24113.h"
> diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
> index 2916d7c..4c4c3a0 100644
> --- a/drivers/media/dvb-frontends/cx24116.c
> +++ b/drivers/media/dvb-frontends/cx24116.c
> @@ -38,7 +38,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/firmware.h>
>
> #include "dvb_frontend.h"
> diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
> index 68f768a..c61e113 100644
> --- a/drivers/media/dvb-frontends/cx24117.c
> +++ b/drivers/media/dvb-frontends/cx24117.c
> @@ -28,7 +28,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/firmware.h>
>
> #include "tuner-i2c.h"
> diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
> index 72fb583..9c56f4a 100644
> --- a/drivers/media/dvb-frontends/cx24123.c
> +++ b/drivers/media/dvb-frontends/cx24123.c
> @@ -25,7 +25,6 @@
> #include <linux/slab.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <asm/div64.h>
>
> #include "dvb_frontend.h"
> diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
> index af91e0c..1b0eefc 100644
> --- a/drivers/media/dvb-frontends/dib3000mb.c
> +++ b/drivers/media/dvb-frontends/dib3000mb.c
> @@ -23,7 +23,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
> index 959ae36..d400579 100644
> --- a/drivers/media/dvb-frontends/drxd_hard.c
> +++ b/drivers/media/dvb-frontends/drxd_hard.c
> @@ -24,7 +24,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
> index bf29a3f..5fc7ad1 100644
> --- a/drivers/media/dvb-frontends/drxk_hard.c
> +++ b/drivers/media/dvb-frontends/drxk_hard.c
> @@ -26,7 +26,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
> index 1e344b0..97891f3 100644
> --- a/drivers/media/dvb-frontends/ds3000.c
> +++ b/drivers/media/dvb-frontends/ds3000.c
> @@ -23,7 +23,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/firmware.h>
>
> #include "dvb_frontend.h"
> diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
> index d5acc30..14cc1fe 100644
> --- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
> +++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
> index 0c642a5..21c365c 100644
> --- a/drivers/media/dvb-frontends/isl6405.c
> +++ b/drivers/media/dvb-frontends/isl6405.c
> @@ -26,7 +26,6 @@
> */
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
> index c77002f..0e3892f 100644
> --- a/drivers/media/dvb-frontends/isl6421.c
> +++ b/drivers/media/dvb-frontends/isl6421.c
> @@ -26,7 +26,6 @@
> */
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
> index dca5beb..abe1f40 100644
> --- a/drivers/media/dvb-frontends/isl6423.c
> +++ b/drivers/media/dvb-frontends/isl6423.c
> @@ -20,7 +20,6 @@
>
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/it913x-fe.c b/drivers/media/dvb-frontends/it913x-fe.c
> index 6e1c6eb..3a7724f 100644
> --- a/drivers/media/dvb-frontends/it913x-fe.c
> +++ b/drivers/media/dvb-frontends/it913x-fe.c
> @@ -23,7 +23,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/types.h>
>
> diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
> index ddf866c..ecbcc30 100644
> --- a/drivers/media/dvb-frontends/l64781.c
> +++ b/drivers/media/dvb-frontends/l64781.c
> @@ -20,7 +20,6 @@
>
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
> index e046622..987275b 100644
> --- a/drivers/media/dvb-frontends/lgdt330x.c
> +++ b/drivers/media/dvb-frontends/lgdt330x.c
> @@ -35,7 +35,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
> index 416cce3..72152bd 100644
> --- a/drivers/media/dvb-frontends/lgs8gl5.c
> +++ b/drivers/media/dvb-frontends/lgs8gl5.c
> @@ -21,7 +21,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
> index f3ba7b5..e4ebb83 100644
> --- a/drivers/media/dvb-frontends/lnbp21.c
> +++ b/drivers/media/dvb-frontends/lnbp21.c
> @@ -26,7 +26,6 @@
> */
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
> index c463da7..e3602f8 100644
> --- a/drivers/media/dvb-frontends/lnbp22.c
> +++ b/drivers/media/dvb-frontends/lnbp22.c
> @@ -26,7 +26,6 @@
> */
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
> index b235146..4a2893a 100644
> --- a/drivers/media/dvb-frontends/m88rs2000.c
> +++ b/drivers/media/dvb-frontends/m88rs2000.c
> @@ -22,7 +22,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>
> */
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/jiffies.h>
> diff --git a/drivers/media/dvb-frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
> index 9ae40ab..d02662a 100644
> --- a/drivers/media/dvb-frontends/mb86a16.c
> +++ b/drivers/media/dvb-frontends/mb86a16.c
> @@ -18,7 +18,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
> index a74ac0d..34d1410 100644
> --- a/drivers/media/dvb-frontends/mt312.c
> +++ b/drivers/media/dvb-frontends/mt312.c
> @@ -26,7 +26,6 @@
>
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
> index 2c3b50e..baf231c 100644
> --- a/drivers/media/dvb-frontends/mt352.c
> +++ b/drivers/media/dvb-frontends/mt352.c
> @@ -32,7 +32,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
> index 4bf0575..c63b03a 100644
> --- a/drivers/media/dvb-frontends/nxt200x.c
> +++ b/drivers/media/dvb-frontends/nxt200x.c
> @@ -47,7 +47,6 @@
> #define CRC_CCIT_MASK 0x1021
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
> index 90ae6c7..0cc0bc6 100644
> --- a/drivers/media/dvb-frontends/nxt6000.c
> +++ b/drivers/media/dvb-frontends/nxt6000.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
> index 5ef9218..236fa19 100644
> --- a/drivers/media/dvb-frontends/or51132.c
> +++ b/drivers/media/dvb-frontends/or51132.c
> @@ -36,7 +36,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
> index f71b062..4ade31b 100644
> --- a/drivers/media/dvb-frontends/s5h1409.c
> +++ b/drivers/media/dvb-frontends/s5h1409.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
> index 6cc4b7a..3839886 100644
> --- a/drivers/media/dvb-frontends/s5h1411.c
> +++ b/drivers/media/dvb-frontends/s5h1411.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
> index 93eeaf7..7814c13 100644
> --- a/drivers/media/dvb-frontends/s5h1420.c
> +++ b/drivers/media/dvb-frontends/s5h1420.c
> @@ -24,7 +24,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
> index 6ec16a2..f3135b8 100644
> --- a/drivers/media/dvb-frontends/s5h1432.c
> +++ b/drivers/media/dvb-frontends/s5h1432.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
> index 73b47cc..b21cb00 100644
> --- a/drivers/media/dvb-frontends/si21xx.c
> +++ b/drivers/media/dvb-frontends/si21xx.c
> @@ -8,7 +8,6 @@
> * (at your option) any later version.
> *
> */
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
> index 2aa8ef7..f5fc713 100644
> --- a/drivers/media/dvb-frontends/sp8870.c
> +++ b/drivers/media/dvb-frontends/sp8870.c
> @@ -27,7 +27,6 @@
> */
> #define SP8870_DEFAULT_FIRMWARE "dvb-fe-sp8870.fw"
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/firmware.h>
> diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
> index 1bb81b5..f326955 100644
> --- a/drivers/media/dvb-frontends/sp887x.c
> +++ b/drivers/media/dvb-frontends/sp887x.c
> @@ -10,7 +10,6 @@
> */
> #define SP887X_DEFAULT_FIRMWARE "dvb-fe-sp887x.fw"
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/firmware.h>
> diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
> index 07cd5ea..7fabfbd 100644
> --- a/drivers/media/dvb-frontends/stb0899_drv.c
> +++ b/drivers/media/dvb-frontends/stb0899_drv.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
> index cea175d..4265e40 100644
> --- a/drivers/media/dvb-frontends/stb6100.c
> +++ b/drivers/media/dvb-frontends/stb6100.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
> index 632b251..8731001 100644
> --- a/drivers/media/dvb-frontends/stv0288.c
> +++ b/drivers/media/dvb-frontends/stv0288.c
> @@ -25,7 +25,6 @@
>
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
> index d40f226..18903e5 100644
> --- a/drivers/media/dvb-frontends/stv0297.c
> +++ b/drivers/media/dvb-frontends/stv0297.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
> index b57ecf4..baccefd 100644
> --- a/drivers/media/dvb-frontends/stv0299.c
> +++ b/drivers/media/dvb-frontends/stv0299.c
> @@ -42,7 +42,6 @@
>
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
> index 23e872f..9160cd1 100644
> --- a/drivers/media/dvb-frontends/stv090x.c
> +++ b/drivers/media/dvb-frontends/stv090x.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
> index e66154e..9e1078e 100644
> --- a/drivers/media/dvb-frontends/stv6110x.c
> +++ b/drivers/media/dvb-frontends/stv6110x.c
> @@ -20,7 +20,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
> index 1bff7f4..3558a54 100644
> --- a/drivers/media/dvb-frontends/tda10021.c
> +++ b/drivers/media/dvb-frontends/tda10021.c
> @@ -23,7 +23,6 @@
>
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
> index ca1e0d5..f8193a5 100644
> --- a/drivers/media/dvb-frontends/tda10023.c
> +++ b/drivers/media/dvb-frontends/tda10023.c
> @@ -27,7 +27,6 @@
>
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
> index 71fb632..80adcb3 100644
> --- a/drivers/media/dvb-frontends/tda10048.c
> +++ b/drivers/media/dvb-frontends/tda10048.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
> index a2631be..d99a5dd 100644
> --- a/drivers/media/dvb-frontends/tda1004x.c
> +++ b/drivers/media/dvb-frontends/tda1004x.c
> @@ -29,7 +29,6 @@
> #define TDA10045_DEFAULT_FIRMWARE "dvb-fe-tda10045.fw"
> #define TDA10046_DEFAULT_FIRMWARE "dvb-fe-tda10046.fw"
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/jiffies.h>
> diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
> index fcfe2e0..5d8ee20 100644
> --- a/drivers/media/dvb-frontends/tda10086.c
> +++ b/drivers/media/dvb-frontends/tda10086.c
> @@ -20,7 +20,6 @@
>
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> #include <linux/jiffies.h>
> diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
> index 2c54586..2653c06 100644
> --- a/drivers/media/dvb-frontends/tda18271c2dd.c
> +++ b/drivers/media/dvb-frontends/tda18271c2dd.c
> @@ -25,7 +25,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
> index 63cc123..bf9f94b 100644
> --- a/drivers/media/dvb-frontends/tda665x.c
> +++ b/drivers/media/dvb-frontends/tda665x.c
> @@ -17,7 +17,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
> index 69e62f4..c5c1f59 100644
> --- a/drivers/media/dvb-frontends/tda8083.c
> +++ b/drivers/media/dvb-frontends/tda8083.c
> @@ -24,7 +24,6 @@
>
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
> index 19c4888..78ee1df 100644
> --- a/drivers/media/dvb-frontends/tda8261.c
> +++ b/drivers/media/dvb-frontends/tda8261.c
> @@ -18,7 +18,6 @@
> */
>
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
> index bb42b56..53090a5 100644
> --- a/drivers/media/dvb-frontends/ves1820.c
> +++ b/drivers/media/dvb-frontends/ves1820.c
> @@ -20,7 +20,6 @@
>
> #include <linux/delay.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
> index 9c17eac..0cbaf19 100644
> --- a/drivers/media/dvb-frontends/ves1x93.c
> +++ b/drivers/media/dvb-frontends/ves1x93.c
> @@ -25,7 +25,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
> index 91b6b2e..575ac33 100644
> --- a/drivers/media/dvb-frontends/zl10039.c
> +++ b/drivers/media/dvb-frontends/zl10039.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> #include <linux/dvb/frontend.h>
> diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
> index 82946cd..92cc0c3 100644
> --- a/drivers/media/dvb-frontends/zl10353.c
> +++ b/drivers/media/dvb-frontends/zl10353.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
> index d7d99f1..45db360 100644
> --- a/drivers/media/i2c/adv7180.c
> +++ b/drivers/media/i2c/adv7180.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> #include <linux/interrupt.h>
> diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
> index d45e0e3..c319584 100644
> --- a/drivers/media/i2c/adv7183.c
> +++ b/drivers/media/i2c/adv7183.c
> @@ -21,7 +21,6 @@
> #include <linux/errno.h>
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/types.h>
> diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
> index d4e15a6..a3e207e 100644
> --- a/drivers/media/i2c/adv7343.c
> +++ b/drivers/media/i2c/adv7343.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/ctype.h>
> #include <linux/slab.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/i2c/adv7393.c b/drivers/media/i2c/adv7393.c
> index 558f191..a519aa5 100644
> --- a/drivers/media/i2c/adv7393.c
> +++ b/drivers/media/i2c/adv7393.c
> @@ -21,7 +21,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/ctype.h>
> #include <linux/slab.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
> index c14e667..b8f395e 100644
> --- a/drivers/media/i2c/ak881x.c
> +++ b/drivers/media/i2c/ak881x.c
> @@ -9,7 +9,6 @@
> */
>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
> index 99ee456..f74e26b 100644
> --- a/drivers/media/i2c/ir-kbd-i2c.c
> +++ b/drivers/media/i2c/ir-kbd-i2c.c
> @@ -36,7 +36,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/string.h>
> #include <linux/timer.h>
> diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
> index c3e94ae..830c84f 100644
> --- a/drivers/media/i2c/ks0127.c
> +++ b/drivers/media/i2c/ks0127.c
> @@ -33,7 +33,6 @@
> * V1.1 Gerard v.d. Horst Added some debugoutput, reset the video-standard
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/delay.h>
> #include <linux/errno.h>
> diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
> index a9110d8..5775a6e 100644
> --- a/drivers/media/i2c/ml86v7667.c
> +++ b/drivers/media/i2c/ml86v7667.c
> @@ -11,7 +11,6 @@
> * option) any later version.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c
> index 85ec3ba..d20568b 100644
> --- a/drivers/media/i2c/mt9m032.c
> +++ b/drivers/media/i2c/mt9m032.c
> @@ -22,7 +22,6 @@
>
> #include <linux/delay.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/math64.h>
> #include <linux/module.h>
> diff --git a/drivers/media/i2c/ov7640.c b/drivers/media/i2c/ov7640.c
> index faa64ba..0171198 100644
> --- a/drivers/media/i2c/ov7640.c
> +++ b/drivers/media/i2c/ov7640.c
> @@ -15,7 +15,6 @@
> * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
> index e8a1ce2..8e45ba2 100644
> --- a/drivers/media/i2c/ov7670.c
> +++ b/drivers/media/i2c/ov7670.c
> @@ -10,7 +10,6 @@
> * This file may be distributed under the terms of the GNU General
> * Public License, version 2.
> */
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index e7f555c..56a979f 100644
> --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -20,7 +20,6 @@
> #include <linux/firmware.h>
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/media.h>
> #include <linux/module.h>
> #include <linux/regulator/consumer.h>
> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
> index 8001cde..e6a23a1 100644
> --- a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
> @@ -20,7 +20,6 @@
> #include <linux/firmware.h>
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/media.h>
> #include <linux/module.h>
> #include <linux/regulator/consumer.h>
> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
> index 8079e26..09b3890 100644
> --- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
> @@ -17,7 +17,6 @@
>
> #include <linux/sizes.h>
> #include <linux/delay.h>
> -#include <linux/init.h>
> #include <linux/media.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
> index 2960b5a..18c42ca 100644
> --- a/drivers/media/i2c/saa6588.c
> +++ b/drivers/media/i2c/saa6588.c
> @@ -24,7 +24,6 @@
> #include <linux/i2c.h>
> #include <linux/types.h>
> #include <linux/videodev2.h>
> -#include <linux/init.h>
> #include <linux/errno.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
> index 8272c0b..234ea56 100644
> --- a/drivers/media/i2c/saa6752hs.c
> +++ b/drivers/media/i2c/saa6752hs.c
> @@ -33,7 +33,6 @@
> #include <linux/i2c.h>
> #include <linux/types.h>
> #include <linux/videodev2.h>
> -#include <linux/init.h>
> #include <linux/crc32.h>
> #include <media/v4l2-device.h>
> #include <media/v4l2-ctrls.h>
> diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
> index ac43e92..88d6cb9 100644
> --- a/drivers/media/i2c/saa7110.c
> +++ b/drivers/media/i2c/saa7110.c
> @@ -26,7 +26,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/types.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/saa7191.c b/drivers/media/i2c/saa7191.c
> index 606a4ba..c129152 100644
> --- a/drivers/media/i2c/saa7191.c
> +++ b/drivers/media/i2c/saa7191.c
> @@ -12,7 +12,6 @@
> #include <linux/delay.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/major.h>
> #include <linux/module.h>
> diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
> index 46f431a..00e014d 100644
> --- a/drivers/media/i2c/soc_camera/mt9t112.c
> +++ b/drivers/media/i2c/soc_camera/mt9t112.c
> @@ -19,7 +19,6 @@
>
> #include <linux/delay.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/v4l2-mediabus.h>
> diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
> index 6c6b1c3..5f2210b 100644
> --- a/drivers/media/i2c/soc_camera/ov2640.c
> +++ b/drivers/media/i2c/soc_camera/ov2640.c
> @@ -13,7 +13,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
> index 7f2b3c8..7bcbaac 100644
> --- a/drivers/media/i2c/soc_camera/ov772x.c
> +++ b/drivers/media/i2c/soc_camera/ov772x.c
> @@ -15,7 +15,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
> index bc74224..28aac74 100644
> --- a/drivers/media/i2c/soc_camera/ov9640.c
> +++ b/drivers/media/i2c/soc_camera/ov9640.c
> @@ -19,7 +19,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
> index ea76863..3dbd1ba 100644
> --- a/drivers/media/i2c/soc_camera/ov9740.c
> +++ b/drivers/media/i2c/soc_camera/ov9740.c
> @@ -10,7 +10,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
> index ab54628..f35882b 100644
> --- a/drivers/media/i2c/soc_camera/tw9910.c
> +++ b/drivers/media/i2c/soc_camera/tw9910.c
> @@ -16,7 +16,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/sony-btf-mpx.c b/drivers/media/i2c/sony-btf-mpx.c
> index 32d8232..c2eede1 100644
> --- a/drivers/media/i2c/sony-btf-mpx.c
> +++ b/drivers/media/i2c/sony-btf-mpx.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> #include <media/tuner.h>
> diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
> index 72af644..ae5749d 100644
> --- a/drivers/media/i2c/tda7432.c
> +++ b/drivers/media/i2c/tda7432.c
> @@ -23,7 +23,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/string.h>
> #include <linux/timer.h>
> diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
> index d76c53a8..b17b484 100644
> --- a/drivers/media/i2c/tvaudio.c
> +++ b/drivers/media/i2c/tvaudio.c
> @@ -32,7 +32,6 @@
> #include <linux/slab.h>
> #include <linux/videodev2.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/kthread.h>
> #include <linux/freezer.h>
>
> diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
> index f58607d..840067b 100644
> --- a/drivers/media/i2c/tw2804.c
> +++ b/drivers/media/i2c/tw2804.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> #include <linux/ioctl.h>
> diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c
> index 285b759..8dde4c7 100644
> --- a/drivers/media/i2c/tw9903.c
> +++ b/drivers/media/i2c/tw9903.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> #include <linux/ioctl.h>
> diff --git a/drivers/media/i2c/tw9906.c b/drivers/media/i2c/tw9906.c
> index f6bef25..5ec7a8d 100644
> --- a/drivers/media/i2c/tw9906.c
> +++ b/drivers/media/i2c/tw9906.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> #include <linux/ioctl.h>
> diff --git a/drivers/media/i2c/uda1342.c b/drivers/media/i2c/uda1342.c
> index 081786d..2c20ac22 100644
> --- a/drivers/media/i2c/uda1342.c
> +++ b/drivers/media/i2c/uda1342.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> #include <media/v4l2-device.h>
> diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
> index ece90df..32ceaf4 100644
> --- a/drivers/media/i2c/vpx3220.c
> +++ b/drivers/media/i2c/vpx3220.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/types.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
> index 23f4f65..f8a80db 100644
> --- a/drivers/media/i2c/vs6624.c
> +++ b/drivers/media/i2c/vs6624.c
> @@ -21,7 +21,6 @@
> #include <linux/errno.h>
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/types.h>
> diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
> index 922e823..2cc95b1 100644
> --- a/drivers/media/pci/bt8xx/bttv-gpio.c
> +++ b/drivers/media/pci/bt8xx/bttv-gpio.c
> @@ -29,7 +29,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
> index d43911d..2d5c451 100644
> --- a/drivers/media/pci/bt8xx/bttv-i2c.c
> +++ b/drivers/media/pci/bt8xx/bttv-i2c.c
> @@ -30,7 +30,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
>
> #include "bttvp.h"
> diff --git a/drivers/media/pci/bt8xx/bttv-if.c b/drivers/media/pci/bt8xx/bttv-if.c
> index a6a540d..075eb78 100644
> --- a/drivers/media/pci/bt8xx/bttv-if.c
> +++ b/drivers/media/pci/bt8xx/bttv-if.c
> @@ -27,7 +27,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <asm/io.h>
>
> diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
> index f368213..1f17971 100644
> --- a/drivers/media/pci/bt8xx/bttv-input.c
> +++ b/drivers/media/pci/bt8xx/bttv-input.c
> @@ -21,7 +21,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> #include <linux/input.h>
> diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
> index 82cc47d..bcea329 100644
> --- a/drivers/media/pci/bt8xx/bttv-risc.c
> +++ b/drivers/media/pci/bt8xx/bttv-risc.c
> @@ -27,7 +27,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/pci.h>
> #include <linux/vmalloc.h>
> diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
> index 430b3eb..bbc901c 100644
> --- a/drivers/media/pci/bt8xx/dst.c
> +++ b/drivers/media/pci/bt8xx/dst.c
> @@ -20,7 +20,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> #include <linux/vmalloc.h>
> diff --git a/drivers/media/pci/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
> index 0e788fc..4e36cf6 100644
> --- a/drivers/media/pci/bt8xx/dst_ca.c
> +++ b/drivers/media/pci/bt8xx/dst_ca.c
> @@ -21,7 +21,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/mutex.h>
> #include <linux/string.h>
> #include <linux/dvb/ca.h>
> diff --git a/drivers/media/pci/cx18/cx18-alsa-pcm.c b/drivers/media/pci/cx18/cx18-alsa-pcm.c
> index 180077c..e65616d 100644
> --- a/drivers/media/pci/cx18/cx18-alsa-pcm.c
> +++ b/drivers/media/pci/cx18/cx18-alsa-pcm.c
> @@ -23,7 +23,6 @@
> * 02111-1307 USA
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/vmalloc.h>
>
> diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h
> index 57f4688..57ef0d8 100644
> --- a/drivers/media/pci/cx18/cx18-driver.h
> +++ b/drivers/media/pci/cx18/cx18-driver.h
> @@ -27,7 +27,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/sched.h>
> #include <linux/fs.h>
> diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
> index 95666ee..47313cf 100644
> --- a/drivers/media/pci/cx23885/cx23885-417.c
> +++ b/drivers/media/pci/cx23885/cx23885-417.c
> @@ -26,7 +26,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/fs.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
> index c6c9bd5..771311a 100644
> --- a/drivers/media/pci/cx23885/cx23885-alsa.c
> +++ b/drivers/media/pci/cx23885/cx23885-alsa.c
> @@ -22,7 +22,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/interrupt.h>
> #include <linux/vmalloc.h>
> diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
> index 79f20c8..0a2cd9f 100644
> --- a/drivers/media/pci/cx23885/cx23885-cards.c
> +++ b/drivers/media/pci/cx23885/cx23885-cards.c
> @@ -19,7 +19,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
> index 0549205..f1a563f 100644
> --- a/drivers/media/pci/cx23885/cx23885-dvb.c
> +++ b/drivers/media/pci/cx23885/cx23885-dvb.c
> @@ -20,7 +20,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/fs.h>
> #include <linux/kthread.h>
> diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c
> index 4887314..6d6345e 100644
> --- a/drivers/media/pci/cx23885/cx23885-i2c.c
> +++ b/drivers/media/pci/cx23885/cx23885-i2c.c
> @@ -21,7 +21,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <asm/io.h>
>
> diff --git a/drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/pci/cx23885/cx23885-vbi.c
> index a1154f0..332b40b 100644
> --- a/drivers/media/pci/cx23885/cx23885-vbi.c
> +++ b/drivers/media/pci/cx23885/cx23885-vbi.c
> @@ -22,7 +22,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
>
> #include "cx23885.h"
>
> diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
> index 7891f34..68bfee8 100644
> --- a/drivers/media/pci/cx23885/cx23885-video.c
> +++ b/drivers/media/pci/cx23885/cx23885-video.c
> @@ -19,7 +19,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
> index b1e08c3..5f6b88b 100644
> --- a/drivers/media/pci/cx25821/cx25821-alsa.c
> +++ b/drivers/media/pci/cx25821/cx25821-alsa.c
> @@ -23,7 +23,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/interrupt.h>
> #include <linux/vmalloc.h>
> diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
> index 68dbc2d..0c7bb8c 100644
> --- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
> +++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
> @@ -28,7 +28,6 @@
> #include <linux/fs.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/syscalls.h>
> #include <linux/file.h>
> diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
> index f2ebc98..c35c71e 100644
> --- a/drivers/media/pci/cx25821/cx25821-cards.c
> +++ b/drivers/media/pci/cx25821/cx25821-cards.c
> @@ -23,7 +23,6 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
> index 1f43be0..db76689 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
> +++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
> @@ -27,7 +27,6 @@
>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/pci/cx25821/cx25821-video.h
> index ab63b38..79216c6 100644
> --- a/drivers/media/pci/cx25821/cx25821-video.h
> +++ b/drivers/media/pci/cx25821/cx25821-video.h
> @@ -24,7 +24,6 @@
> #ifndef CX25821_VIDEO_H_
> #define CX25821_VIDEO_H_
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
> index d014206e..218f64a 100644
> --- a/drivers/media/pci/cx88/cx88-alsa.c
> +++ b/drivers/media/pci/cx88/cx88-alsa.c
> @@ -25,7 +25,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/interrupt.h>
> #include <linux/vmalloc.h>
> diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
> index e18a7ac..7584afc 100644
> --- a/drivers/media/pci/cx88/cx88-cards.c
> +++ b/drivers/media/pci/cx88/cx88-cards.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
> index ad59dc9..bf04477 100644
> --- a/drivers/media/pci/cx88/cx88-core.c
> +++ b/drivers/media/pci/cx88/cx88-core.c
> @@ -25,7 +25,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/cx88/cx88-i2c.c b/drivers/media/pci/cx88/cx88-i2c.c
> index cf2d696..4f80bb5 100644
> --- a/drivers/media/pci/cx88/cx88-i2c.c
> +++ b/drivers/media/pci/cx88/cx88-i2c.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
>
> #include <asm/io.h>
>
> diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
> index f29e18c..9de7287 100644
> --- a/drivers/media/pci/cx88/cx88-input.c
> +++ b/drivers/media/pci/cx88/cx88-input.c
> @@ -22,7 +22,6 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> -#include <linux/init.h>
> #include <linux/hrtimer.h>
> #include <linux/pci.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
> index 74b7b86..fb8e78f 100644
> --- a/drivers/media/pci/cx88/cx88-mpeg.c
> +++ b/drivers/media/pci/cx88/cx88-mpeg.c
> @@ -24,7 +24,6 @@
>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/dma-mapping.h>
> #include <linux/interrupt.h>
> diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c
> index 424fd97..43c53b5 100644
> --- a/drivers/media/pci/cx88/cx88-tvaudio.c
> +++ b/drivers/media/pci/cx88/cx88-tvaudio.c
> @@ -46,7 +46,6 @@
> #include <linux/types.h>
> #include <linux/interrupt.h>
> #include <linux/vmalloc.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/kthread.h>
>
> diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c
> index f8f8389..2ea1190 100644
> --- a/drivers/media/pci/cx88/cx88-vbi.c
> +++ b/drivers/media/pci/cx88/cx88-vbi.c
> @@ -2,7 +2,6 @@
> */
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
>
> #include "cx88.h"
>
> diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
> index ed8cb90..7401bcb 100644
> --- a/drivers/media/pci/cx88/cx88-video.c
> +++ b/drivers/media/pci/cx88/cx88-video.c
> @@ -25,7 +25,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kmod.h>
> diff --git a/drivers/media/pci/cx88/cx88-vp3054-i2c.c b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
> index deede6e..742bfca 100644
> --- a/drivers/media/pci/cx88/cx88-vp3054-i2c.c
> +++ b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
> @@ -24,7 +24,6 @@
>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
>
> #include <asm/io.h>
>
> diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
> index e60ac35..419194f 100644
> --- a/drivers/media/pci/dm1105/dm1105.c
> +++ b/drivers/media/pci/dm1105/dm1105.c
> @@ -21,7 +21,6 @@
>
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
> index e1863db..9fd932b 100644
> --- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
> +++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
> @@ -23,7 +23,6 @@
> * 02111-1307 USA
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/vmalloc.h>
>
> diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
> index bc309f42c..408343a 100644
> --- a/drivers/media/pci/ivtv/ivtv-driver.h
> +++ b/drivers/media/pci/ivtv/ivtv-driver.h
> @@ -37,7 +37,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/sched.h>
> #include <linux/fs.h>
> diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
> index 9e89e04..fbf0182 100644
> --- a/drivers/media/pci/mantis/mantis_pci.c
> +++ b/drivers/media/pci/mantis/mantis_pci.c
> @@ -25,7 +25,6 @@
> #include <asm/page.h>
> #include <linux/kmod.h>
> #include <linux/vmalloc.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/pci.h>
>
> diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
> index 970e833..1eec301 100644
> --- a/drivers/media/pci/ngene/ngene-core.c
> +++ b/drivers/media/pci/ngene/ngene-core.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/poll.h>
> #include <linux/io.h>
> diff --git a/drivers/media/pci/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c
> index fcb16a6..e94b4d5 100644
> --- a/drivers/media/pci/ngene/ngene-dvb.c
> +++ b/drivers/media/pci/ngene/ngene-dvb.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
> index d28554f..434caf0 100644
> --- a/drivers/media/pci/ngene/ngene-i2c.c
> +++ b/drivers/media/pci/ngene/ngene-i2c.c
> @@ -29,7 +29,6 @@
>
> /* FIXME - some of these can probably be removed */
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
> index 655d6854..8293eb7 100644
> --- a/drivers/media/pci/pluto2/pluto2.c
> +++ b/drivers/media/pci/pluto2/pluto2.c
> @@ -25,7 +25,6 @@
>
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
> index dd67c8a..33e22c1 100644
> --- a/drivers/media/pci/saa7134/saa7134-alsa.c
> +++ b/drivers/media/pci/saa7134/saa7134-alsa.c
> @@ -16,7 +16,6 @@
> *
> */
>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/time.h>
> #include <linux/wait.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
> index d45e7f6..9ae7ca2 100644
> --- a/drivers/media/pci/saa7134/saa7134-cards.c
> +++ b/drivers/media/pci/saa7134/saa7134-cards.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
> index c68169d..c71abff 100644
> --- a/drivers/media/pci/saa7134/saa7134-i2c.c
> +++ b/drivers/media/pci/saa7134/saa7134-i2c.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
> index 6f43126..255a35e 100644
> --- a/drivers/media/pci/saa7134/saa7134-input.c
> +++ b/drivers/media/pci/saa7134/saa7134-input.c
> @@ -19,7 +19,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
> index 2e3f4b4..6957176 100644
> --- a/drivers/media/pci/saa7134/saa7134-ts.c
> +++ b/drivers/media/pci/saa7134/saa7134-ts.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
> index 0f34e09..ed532f4 100644
> --- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
> +++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
> index d4da18d..ce80d7c 100644
> --- a/drivers/media/pci/saa7134/saa7134-vbi.c
> +++ b/drivers/media/pci/saa7134/saa7134-vbi.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index eb472b5..6d05685 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -20,7 +20,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/saa7164/saa7164-cards.c b/drivers/media/pci/saa7164/saa7164-cards.c
> index 5b72da5..4698daa 100644
> --- a/drivers/media/pci/saa7164/saa7164-cards.c
> +++ b/drivers/media/pci/saa7164/saa7164-cards.c
> @@ -19,7 +19,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c
> index 4f7e3b4..a9a0c8d 100644
> --- a/drivers/media/pci/saa7164/saa7164-i2c.c
> +++ b/drivers/media/pci/saa7164/saa7164-i2c.c
> @@ -21,7 +21,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/io.h>
>
> diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
> index 0e763a7..c77222d 100644
> --- a/drivers/media/pci/ttpci/av7110_ir.c
> +++ b/drivers/media/pci/ttpci/av7110_ir.c
> @@ -23,7 +23,6 @@
>
>
> #include <linux/types.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/proc_fs.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/pci/ttpci/ttpci-eeprom.c b/drivers/media/pci/ttpci/ttpci-eeprom.c
> index 32d4315..862552b 100644
> --- a/drivers/media/pci/ttpci/ttpci-eeprom.c
> +++ b/drivers/media/pci/ttpci/ttpci-eeprom.c
> @@ -32,7 +32,6 @@
> */
>
> #include <asm/errno.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/i2c.h>
> diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
> index e7e9840..6c4ab66 100644
> --- a/drivers/media/pci/zoran/zoran_driver.c
> +++ b/drivers/media/pci/zoran/zoran_driver.c
> @@ -44,7 +44,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/delay.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
> index 2819165..119bc0a 100644
> --- a/drivers/media/platform/blackfin/bfin_capture.c
> +++ b/drivers/media/platform/blackfin/bfin_capture.c
> @@ -22,7 +22,6 @@
> #include <linux/errno.h>
> #include <linux/fs.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/mm.h>
> diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
> index 33b9660..fb86341 100644
> --- a/drivers/media/platform/davinci/vpbe.c
> +++ b/drivers/media/platform/davinci/vpbe.c
> @@ -15,7 +15,6 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
> index b02aba4..7d73561 100644
> --- a/drivers/media/platform/davinci/vpbe_display.c
> +++ b/drivers/media/platform/davinci/vpbe_display.c
> @@ -11,7 +11,6 @@
> * GNU General Public License for more details.
> */
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/errno.h>
> #include <linux/interrupt.h>
> diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
> index 14a023a..62a4cd3 100644
> --- a/drivers/media/platform/davinci/vpbe_venc.c
> +++ b/drivers/media/platform/davinci/vpbe_venc.c
> @@ -16,7 +16,6 @@
> */
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/ctype.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
> index d762246..3253714 100644
> --- a/drivers/media/platform/davinci/vpfe_capture.c
> +++ b/drivers/media/platform/davinci/vpfe_capture.c
> @@ -68,7 +68,6 @@
> */
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/interrupt.h>
> #include <media/v4l2-common.h>
> diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
> index dbf0ce3..9a6c4c0 100644
> --- a/drivers/media/platform/fsl-viu.c
> +++ b/drivers/media/platform/fsl-viu.c
> @@ -18,7 +18,6 @@
> #include <linux/clk.h>
> #include <linux/kernel.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/of_address.h>
> diff --git a/drivers/media/platform/indycam.c b/drivers/media/platform/indycam.c
> index f1d192b..27c0669 100644
> --- a/drivers/media/platform/indycam.c
> +++ b/drivers/media/platform/indycam.c
> @@ -12,7 +12,6 @@
> #include <linux/delay.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/major.h>
> #include <linux/module.h>
> diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
> index e5f1d4c..42c4b90 100644
> --- a/drivers/media/platform/sh_vou.c
> +++ b/drivers/media/platform/sh_vou.c
> @@ -13,7 +13,6 @@
> #include <linux/errno.h>
> #include <linux/fs.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
> index 4835173..78240a6 100644
> --- a/drivers/media/platform/soc_camera/atmel-isi.c
> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> @@ -15,7 +15,6 @@
> #include <linux/completion.h>
> #include <linux/delay.h>
> #include <linux/fs.h>
> -#include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
> index d73abca..ac9af48 100644
> --- a/drivers/media/platform/soc_camera/mx2_camera.c
> +++ b/drivers/media/platform/soc_camera/mx2_camera.c
> @@ -11,7 +11,6 @@
> * (at your option) any later version.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/io.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
> index f975b70..0e915db 100644
> --- a/drivers/media/platform/soc_camera/mx3_camera.c
> +++ b/drivers/media/platform/soc_camera/mx3_camera.c
> @@ -9,7 +9,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/videodev2.h>
> #include <linux/platform_device.h>
> diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
> index d4df305..f918282 100644
> --- a/drivers/media/platform/soc_camera/pxa_camera.c
> +++ b/drivers/media/platform/soc_camera/pxa_camera.c
> @@ -10,7 +10,6 @@
> * (at your option) any later version.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/io.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> index 4b8c024..197fbdf 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -19,7 +19,6 @@
> #include <linux/device.h>
> #include <linux/err.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
> index ceaddfb..54fbe90 100644
> --- a/drivers/media/platform/soc_camera/soc_camera_platform.c
> +++ b/drivers/media/platform/soc_camera/soc_camera_platform.c
> @@ -10,7 +10,6 @@
> * published by the Free Software Foundation.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
> index 142c2ee..8cfe33e 100644
> --- a/drivers/media/radio/dsbr100.c
> +++ b/drivers/media/radio/dsbr100.c
> @@ -36,7 +36,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
> index 6ff3508..c7d2d7a 100644
> --- a/drivers/media/radio/radio-isa.c
> +++ b/drivers/media/radio/radio-isa.c
> @@ -21,7 +21,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/ioport.h>
> #include <linux/delay.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
> index a85b064..f4ae0f6 100644
> --- a/drivers/media/radio/radio-ma901.c
> +++ b/drivers/media/radio/radio-ma901.c
> @@ -22,7 +22,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
> index 5236035..996125d 100644
> --- a/drivers/media/radio/radio-maxiradio.c
> +++ b/drivers/media/radio/radio-maxiradio.c
> @@ -34,7 +34,6 @@
>
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/ioport.h>
> #include <linux/delay.h>
> #include <linux/mutex.h>
> diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
> index a360227..4e57439 100644
> --- a/drivers/media/radio/radio-mr800.c
> +++ b/drivers/media/radio/radio-mr800.c
> @@ -56,7 +56,6 @@
> /* kernel includes */
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c
> index 7b3bdbb..b27b4d5 100644
> --- a/drivers/media/radio/radio-raremono.c
> +++ b/drivers/media/radio/radio-raremono.c
> @@ -17,7 +17,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/usb.h>
> diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
> index 050b3bb..c824eb3 100644
> --- a/drivers/media/radio/radio-shark.c
> +++ b/drivers/media/radio/radio-shark.c
> @@ -25,7 +25,6 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
> index 8654e0d..5318fe3 100644
> --- a/drivers/media/radio/radio-shark2.c
> +++ b/drivers/media/radio/radio-shark2.c
> @@ -25,7 +25,6 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
> index 3ed1f56..e491990 100644
> --- a/drivers/media/radio/radio-tea5764.c
> +++ b/drivers/media/radio/radio-tea5764.c
> @@ -34,7 +34,6 @@
> #include <linux/kernel.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> -#include <linux/init.h> /* Initdata */
> #include <linux/videodev2.h> /* kernel radio structs */
> #include <linux/i2c.h> /* I2C */
> #include <media/v4l2-common.h>
> diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
> index e245597..18aae8e 100644
> --- a/drivers/media/radio/radio-tea5777.c
> +++ b/drivers/media/radio/radio-tea5777.c
> @@ -24,7 +24,6 @@
> */
>
> #include <linux/delay.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
> index ec805b0..4f1ce57 100644
> --- a/drivers/media/radio/saa7706h.c
> +++ b/drivers/media/radio/saa7706h.c
> @@ -17,7 +17,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
> index 4b76604..20c3849 100644
> --- a/drivers/media/radio/si470x/radio-si470x.h
> +++ b/drivers/media/radio/si470x/radio-si470x.h
> @@ -28,7 +28,6 @@
> /* kernel includes */
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
> index ba4cfc9..139ff48 100644
> --- a/drivers/media/radio/si4713/radio-platform-si4713.c
> +++ b/drivers/media/radio/si4713/radio-platform-si4713.c
> @@ -23,7 +23,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/i2c.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c
> index f1e640d..03df453 100644
> --- a/drivers/media/radio/si4713/radio-usb-si4713.c
> +++ b/drivers/media/radio/si4713/radio-usb-si4713.c
> @@ -20,7 +20,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/usb.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/mutex.h>
> diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
> index a9319a2..e62cad6 100644
> --- a/drivers/media/radio/tef6862.c
> +++ b/drivers/media/radio/tef6862.c
> @@ -17,7 +17,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> #include <linux/interrupt.h>
> diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
> index 4d6a63f..fecbed4 100644
> --- a/drivers/media/rc/ati_remote.c
> +++ b/drivers/media/rc/ati_remote.c
> @@ -88,7 +88,6 @@
>
> #include <linux/kernel.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
> index 80c611c..d8481d8 100644
> --- a/drivers/media/rc/gpio-ir-recv.c
> +++ b/drivers/media/rc/gpio-ir-recv.c
> @@ -11,7 +11,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/gpio.h>
> diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
> index 822b9f4..639d346 100644
> --- a/drivers/media/rc/imon.c
> +++ b/drivers/media/rc/imon.c
> @@ -29,7 +29,6 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/tuners/mt2063.c b/drivers/media/tuners/mt2063.c
> index 20cca40..b48fc4c 100644
> --- a/drivers/media/tuners/mt2063.c
> +++ b/drivers/media/tuners/mt2063.c
> @@ -19,7 +19,6 @@
> * GNU General Public License for more details.
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/string.h>
> diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c
> index b473b76..1ebf69c 100644
> --- a/drivers/media/tuners/mxl5005s.c
> +++ b/drivers/media/tuners/mxl5005s.c
> @@ -58,7 +58,6 @@
> respective owners.
> */
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/string.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
> index 9823248..97afd7b 100644
> --- a/drivers/media/tuners/tda9887.c
> +++ b/drivers/media/tuners/tda9887.c
> @@ -2,7 +2,6 @@
> #include <linux/kernel.h>
> #include <linux/i2c.h>
> #include <linux/types.h>
> -#include <linux/init.h>
> #include <linux/errno.h>
> #include <linux/delay.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c
> index 19fe049..5428825 100644
> --- a/drivers/media/usb/au0828/au0828-dvb.c
> +++ b/drivers/media/usb/au0828/au0828-dvb.c
> @@ -21,7 +21,6 @@
>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/suspend.h>
> #include <media/v4l2-common.h>
> diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
> index 17ec365..ae18b7b 100644
> --- a/drivers/media/usb/au0828/au0828-i2c.c
> +++ b/drivers/media/usb/au0828/au0828-i2c.c
> @@ -21,7 +21,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/io.h>
>
> diff --git a/drivers/media/usb/au0828/au0828-vbi.c b/drivers/media/usb/au0828/au0828-vbi.c
> index 63f5930..4373d3c 100644
> --- a/drivers/media/usb/au0828/au0828-vbi.c
> +++ b/drivers/media/usb/au0828/au0828-vbi.c
> @@ -23,7 +23,6 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
>
> #include "au0828.h"
> diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
> index f615454..0bb104e 100644
> --- a/drivers/media/usb/au0828/au0828-video.c
> +++ b/drivers/media/usb/au0828/au0828-video.c
> @@ -30,7 +30,6 @@
>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/suspend.h>
> #include <media/v4l2-common.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
> index 2f63029..e16a00b 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-417.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-417.c
> @@ -26,7 +26,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/init.h>
> #include <linux/fs.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
> index 89de00b..43db655 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
> @@ -22,7 +22,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> index 2ee03e4..4da2cf3 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> @@ -20,7 +20,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
> index 4ba3ce0..9040a24 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-core.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
> @@ -20,7 +20,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
> index b3c6190..88206a0 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
> +++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
> @@ -22,7 +22,6 @@
> #ifndef _PCB_CONFIG_H_
> #define _PCB_CONFIG_H_
>
> -#include <linux/init.h>
> #include <linux/module.h>
>
> /***************************************************************************
> diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
> index c027942..d95aa4f 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
> @@ -19,7 +19,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
> index 9906261..d91d3e1 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-video.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
> @@ -22,7 +22,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/usb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
> index d56f927..4467e37 100644
> --- a/drivers/media/usb/dvb-usb/friio-fe.c
> +++ b/drivers/media/usb/dvb-usb/friio-fe.c
> @@ -10,7 +10,6 @@
> *
> * see Documentation/dvb/README.dvb-usb for more information
> */
> -#include <linux/init.h>
> #include <linux/string.h>
> #include <linux/slab.h>
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index 6efb902..fc68d17 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -23,7 +23,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
> index b6dc332..382bf19 100644
> --- a/drivers/media/usb/em28xx/em28xx-core.c
> +++ b/drivers/media/usb/em28xx/em28xx-core.c
> @@ -22,7 +22,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/jiffies.h>
> #include <linux/list.h>
> #include <linux/module.h>
> diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
> index db3d655..0cc4759 100644
> --- a/drivers/media/usb/em28xx/em28xx-vbi.c
> +++ b/drivers/media/usb/em28xx/em28xx-vbi.c
> @@ -24,7 +24,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/hardirq.h>
> -#include <linux/init.h>
>
> #include "em28xx.h"
> #include "em28xx-v4l.h"
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index a1dcceb..3d7f909 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -26,7 +26,6 @@
> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/usb/hdpvr/hdpvr-control.c b/drivers/media/usb/hdpvr/hdpvr-control.c
> index 6053661..d0f0791 100644
> --- a/drivers/media/usb/hdpvr/hdpvr-control.c
> +++ b/drivers/media/usb/hdpvr/hdpvr-control.c
> @@ -11,7 +11,6 @@
>
> #include <linux/kernel.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/usb.h>
> diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
> index 2f0c89c..04e471e 100644
> --- a/drivers/media/usb/hdpvr/hdpvr-core.c
> +++ b/drivers/media/usb/hdpvr/hdpvr-core.c
> @@ -13,7 +13,6 @@
>
> #include <linux/kernel.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
> index 0500c417..736aba4 100644
> --- a/drivers/media/usb/hdpvr/hdpvr-video.c
> +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
> @@ -12,7 +12,6 @@
> #include <linux/kernel.h>
> #include <linux/kconfig.h>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
> index abf365a..b045645 100644
> --- a/drivers/media/usb/pwc/pwc-if.c
> +++ b/drivers/media/usb/pwc/pwc-if.c
> @@ -58,7 +58,6 @@
> */
>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/module.h>
> #include <linux/poll.h>
> diff --git a/drivers/media/usb/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c
> index aa7449e..6fcbac8 100644
> --- a/drivers/media/usb/pwc/pwc-v4l.c
> +++ b/drivers/media/usb/pwc/pwc-v4l.c
> @@ -27,7 +27,6 @@
> */
>
> #include <linux/errno.h>
> -#include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/module.h>
> #include <linux/poll.h>
> diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
> index 05bd91a..84303a9 100644
> --- a/drivers/media/usb/siano/smsusb.c
> +++ b/drivers/media/usb/siano/smsusb.c
> @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
> ****************************************************************/
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/usb.h>
> #include <linux/firmware.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
> index 34a26e0..99b2f30 100644
> --- a/drivers/media/usb/stk1160/stk1160-core.c
> +++ b/drivers/media/usb/stk1160/stk1160-core.c
> @@ -26,7 +26,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/errno.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
> index be77482..18bc392 100644
> --- a/drivers/media/usb/stkwebcam/stk-webcam.c
> +++ b/drivers/media/usb/stkwebcam/stk-webcam.c
> @@ -23,7 +23,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/errno.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/usb/tlg2300/pd-alsa.c b/drivers/media/usb/tlg2300/pd-alsa.c
> index 3f3e141..e0f51e1 100644
> --- a/drivers/media/usb/tlg2300/pd-alsa.c
> +++ b/drivers/media/usb/tlg2300/pd-alsa.c
> @@ -1,6 +1,5 @@
> #include <linux/kernel.h>
> #include <linux/usb.h>
> -#include <linux/init.h>
> #include <linux/sound.h>
> #include <linux/spinlock.h>
> #include <linux/soundcard.h>
> diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
> index ea6070b..13a57c2 100644
> --- a/drivers/media/usb/tlg2300/pd-radio.c
> +++ b/drivers/media/usb/tlg2300/pd-radio.c
> @@ -1,4 +1,3 @@
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
> index 1ccaadd..88baf37 100644
> --- a/drivers/media/usb/tm6000/tm6000-cards.c
> +++ b/drivers/media/usb/tm6000/tm6000-cards.c
> @@ -17,7 +17,6 @@
> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/delay.h>
> diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c
> index 8a6bbf1..926ba06 100644
> --- a/drivers/media/usb/tm6000/tm6000-input.c
> +++ b/drivers/media/usb/tm6000/tm6000-input.c
> @@ -18,7 +18,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/delay.h>
>
> #include <linux/input.h>
> diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
> index cc1aa14..ec88656 100644
> --- a/drivers/media/usb/tm6000/tm6000-video.c
> +++ b/drivers/media/usb/tm6000/tm6000-video.c
> @@ -28,7 +28,6 @@
> #include <linux/slab.h>
> #include <linux/mm.h>
> #include <linux/ioport.h>
> -#include <linux/init.h>
> #include <linux/sched.h>
> #include <linux/random.h>
> #include <linux/usb.h>
> diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> index f8a60c1..aa643df 100644
> --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
> @@ -9,7 +9,6 @@
> * published by the Free Software Foundation; either version 2 of
> * the License, or (at your option) any later version.
> */
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/wait.h>
> #include <linux/fs.h>
> diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
> index 29724af..94c5051 100644
> --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
> +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
> @@ -29,7 +29,6 @@
> #include <linux/interrupt.h>
> #include <linux/firmware.h>
> #include <linux/crc32.h>
> -#include <linux/init.h>
> #include <linux/input.h>
>
> #include <linux/mutex.h>
> diff --git a/drivers/media/usb/usbtv/usbtv.c b/drivers/media/usb/usbtv/usbtv.c
> index 6222a4a..80262e1 100644
> --- a/drivers/media/usb/usbtv/usbtv.c
> +++ b/drivers/media/usb/usbtv/usbtv.c
> @@ -28,7 +28,6 @@
> * GNU General Public License ("GPL").
> */
>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
> index 816b1cf..191dd2b 100644
> --- a/drivers/media/usb/usbvision/usbvision-core.c
> +++ b/drivers/media/usb/usbvision/usbvision-core.c
> @@ -31,7 +31,6 @@
> #include <linux/highmem.h>
> #include <linux/vmalloc.h>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/spinlock.h>
> #include <linux/io.h>
> #include <linux/videodev2.h>
> diff --git a/drivers/media/usb/usbvision/usbvision-i2c.c b/drivers/media/usb/usbvision/usbvision-i2c.c
> index ba262a3..ae1a1e6 100644
> --- a/drivers/media/usb/usbvision/usbvision-i2c.c
> +++ b/drivers/media/usb/usbvision/usbvision-i2c.c
> @@ -27,7 +27,6 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/delay.h>
> -#include <linux/init.h>
> #include <linux/uaccess.h>
> #include <linux/ioport.h>
> #include <linux/errno.h>
> diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
> index 74d56df..764c655e 100644
> --- a/drivers/media/usb/zr364xx/zr364xx.c
> +++ b/drivers/media/usb/zr364xx/zr364xx.c
> @@ -29,7 +29,6 @@
>
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/usb.h>
> #include <linux/vmalloc.h>
> #include <linux/slab.h>
> diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
> index 20c0922..f9f6d71 100644
> --- a/drivers/media/v4l2-core/tuner-core.c
> +++ b/drivers/media/v4l2-core/tuner-core.c
> @@ -24,7 +24,6 @@
> #include <linux/poll.h>
> #include <linux/i2c.h>
> #include <linux/types.h>
> -#include <linux/init.h>
> #include <linux/videodev2.h>
> #include <media/tuner.h>
> #include <media/tuner-types.h>
> diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
> index fb5ee5d..b837626 100644
> --- a/drivers/media/v4l2-core/videobuf-core.c
> +++ b/drivers/media/v4l2-core/videobuf-core.c
> @@ -13,7 +13,6 @@
> * the Free Software Foundation; either version 2
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/mm.h>
> diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c
> index 65411ad..557d42e 100644
> --- a/drivers/media/v4l2-core/videobuf-dma-contig.c
> +++ b/drivers/media/v4l2-core/videobuf-dma-contig.c
> @@ -14,7 +14,6 @@
> * the Free Software Foundation; either version 2
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/mm.h>
> #include <linux/pagemap.h>
> diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
> index 9db674c..20c4849 100644
> --- a/drivers/media/v4l2-core/videobuf-dma-sg.c
> +++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
> @@ -18,7 +18,6 @@
> * the Free Software Foundation; either version 2
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/sched.h>
> diff --git a/drivers/media/v4l2-core/videobuf-dvb.c b/drivers/media/v4l2-core/videobuf-dvb.c
> index b7efa45..210a7cb 100644
> --- a/drivers/media/v4l2-core/videobuf-dvb.c
> +++ b/drivers/media/v4l2-core/videobuf-dvb.c
> @@ -14,7 +14,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/device.h>
> #include <linux/fs.h>
> #include <linux/kthread.h>
> diff --git a/drivers/media/v4l2-core/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
> index 1365c65..8c524fd 100644
> --- a/drivers/media/v4l2-core/videobuf-vmalloc.c
> +++ b/drivers/media/v4l2-core/videobuf-vmalloc.c
> @@ -13,7 +13,6 @@
> * the Free Software Foundation; either version 2
> */
>
> -#include <linux/init.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/slab.h>
--
Cheers,
Mauro
On Fri, Jan 24, 2014 at 3:21 AM, Paul Gortmaker
<[email protected]> wrote:
> For what it is worth, I'm not removing any patches from my series file
> until they explicitly conflict and/or become redundant. If a maintainer
> says they are adding the patch, I add a comment in the series file, but
> I don't remove them until I see them come into next via another branch,
> and/or sfr reports a conflict/redundancy.
So I can add these patches to my devel branches now I think?
Yours,
Linus Walleij
On 14-02-05 08:02 AM, Linus Walleij wrote:
> On Fri, Jan 24, 2014 at 3:21 AM, Paul Gortmaker
> <[email protected]> wrote:
>
>> For what it is worth, I'm not removing any patches from my series file
>> until they explicitly conflict and/or become redundant. If a maintainer
>> says they are adding the patch, I add a comment in the series file, but
>> I don't remove them until I see them come into next via another branch,
>> and/or sfr reports a conflict/redundancy.
>
> So I can add these patches to my devel branches now I think?
The patches that weren't taken by maintainers before 3.14-rc1 were
encompassed in the cleanup pull request to Linus sent yesterday.
http://www.spinics.net/lists/arm-kernel/msg304864.html
So, assuming he does pull it, you'll not have to do anything.
Thanks,
Paul.
--
>
> Yours,
> Linus Walleij
>
On 14-02-04 02:40 PM, Mauro Carvalho Chehab wrote:
> Em Tue, 21 Jan 2014 16:22:50 -0500
> Paul Gortmaker <[email protected]> escreveu:
>
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>
> Actually, one of the drivers is using it:
> drivers/media/usb/em28xx/em28xx-video.c:static int __init em28xx_video_register(void)
>
> Probably due to a recent patch for 3.14-rc1 that converted em28xx-video
> into a module.
>
> Could you please rebase it, removing __init/__exit rom em28xx-video
> and resend this one for me to merge on my tree?
Actually it appears to me, that the above file is fine. It is
a module, and includes module.h -- which now explicitly includes
init.h (and always will, since it is inevitable.) See this change:
http://www.spinics.net/lists/linux-arch/msg24462.html
BTW, you shouldn't need to do anything with this patch now; the
patches that weren't taken by maintainers before 3.14-rc1 were
encompassed in the cleanup pull request to Linus sent yesterday.
http://www.spinics.net/lists/arm-kernel/msg304864.html
So, assuming he does pull it, you'll not have to do anything.
Thanks,
Paul.
--
>
> Thanks!
> Mauro
>
>
>>
>> Cc: Mauro Carvalho Chehab <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>> drivers/media/common/btcx-risc.c | 1 -
>> drivers/media/common/cx2341x.c | 1 -
>> drivers/media/common/siano/smsdvb-debugfs.c | 1 -
>> drivers/media/common/tveeprom.c | 1 -
>> drivers/media/dvb-frontends/au8522_dig.c | 1 -
>> drivers/media/dvb-frontends/au8522_priv.h | 1 -
>> drivers/media/dvb-frontends/bcm3510.c | 1 -
>> drivers/media/dvb-frontends/cx22700.c | 1 -
>> drivers/media/dvb-frontends/cx22702.c | 1 -
>> drivers/media/dvb-frontends/cx24110.c | 1 -
>> drivers/media/dvb-frontends/cx24113.c | 1 -
>> drivers/media/dvb-frontends/cx24116.c | 1 -
>> drivers/media/dvb-frontends/cx24117.c | 1 -
>> drivers/media/dvb-frontends/cx24123.c | 1 -
>> drivers/media/dvb-frontends/dib3000mb.c | 1 -
>> drivers/media/dvb-frontends/drxd_hard.c | 1 -
>> drivers/media/dvb-frontends/drxk_hard.c | 1 -
>> drivers/media/dvb-frontends/ds3000.c | 1 -
>> drivers/media/dvb-frontends/dvb_dummy_fe.c | 1 -
>> drivers/media/dvb-frontends/isl6405.c | 1 -
>> drivers/media/dvb-frontends/isl6421.c | 1 -
>> drivers/media/dvb-frontends/isl6423.c | 1 -
>> drivers/media/dvb-frontends/it913x-fe.c | 1 -
>> drivers/media/dvb-frontends/l64781.c | 1 -
>> drivers/media/dvb-frontends/lgdt330x.c | 1 -
>> drivers/media/dvb-frontends/lgs8gl5.c | 1 -
>> drivers/media/dvb-frontends/lnbp21.c | 1 -
>> drivers/media/dvb-frontends/lnbp22.c | 1 -
>> drivers/media/dvb-frontends/m88rs2000.c | 1 -
>> drivers/media/dvb-frontends/mb86a16.c | 1 -
>> drivers/media/dvb-frontends/mt312.c | 1 -
>> drivers/media/dvb-frontends/mt352.c | 1 -
>> drivers/media/dvb-frontends/nxt200x.c | 1 -
>> drivers/media/dvb-frontends/nxt6000.c | 1 -
>> drivers/media/dvb-frontends/or51132.c | 1 -
>> drivers/media/dvb-frontends/s5h1409.c | 1 -
>> drivers/media/dvb-frontends/s5h1411.c | 1 -
>> drivers/media/dvb-frontends/s5h1420.c | 1 -
>> drivers/media/dvb-frontends/s5h1432.c | 1 -
>> drivers/media/dvb-frontends/si21xx.c | 1 -
>> drivers/media/dvb-frontends/sp8870.c | 1 -
>> drivers/media/dvb-frontends/sp887x.c | 1 -
>> drivers/media/dvb-frontends/stb0899_drv.c | 1 -
>> drivers/media/dvb-frontends/stb6100.c | 1 -
>> drivers/media/dvb-frontends/stv0288.c | 1 -
>> drivers/media/dvb-frontends/stv0297.c | 1 -
>> drivers/media/dvb-frontends/stv0299.c | 1 -
>> drivers/media/dvb-frontends/stv090x.c | 1 -
>> drivers/media/dvb-frontends/stv6110x.c | 1 -
>> drivers/media/dvb-frontends/tda10021.c | 1 -
>> drivers/media/dvb-frontends/tda10023.c | 1 -
>> drivers/media/dvb-frontends/tda10048.c | 1 -
>> drivers/media/dvb-frontends/tda1004x.c | 1 -
>> drivers/media/dvb-frontends/tda10086.c | 1 -
>> drivers/media/dvb-frontends/tda18271c2dd.c | 1 -
>> drivers/media/dvb-frontends/tda665x.c | 1 -
>> drivers/media/dvb-frontends/tda8083.c | 1 -
>> drivers/media/dvb-frontends/tda8261.c | 1 -
>> drivers/media/dvb-frontends/ves1820.c | 1 -
>> drivers/media/dvb-frontends/ves1x93.c | 1 -
>> drivers/media/dvb-frontends/zl10039.c | 1 -
>> drivers/media/dvb-frontends/zl10353.c | 1 -
>> drivers/media/i2c/adv7180.c | 1 -
>> drivers/media/i2c/adv7183.c | 1 -
>> drivers/media/i2c/adv7343.c | 1 -
>> drivers/media/i2c/adv7393.c | 1 -
>> drivers/media/i2c/ak881x.c | 1 -
>> drivers/media/i2c/ir-kbd-i2c.c | 1 -
>> drivers/media/i2c/ks0127.c | 1 -
>> drivers/media/i2c/ml86v7667.c | 1 -
>> drivers/media/i2c/mt9m032.c | 1 -
>> drivers/media/i2c/ov7640.c | 1 -
>> drivers/media/i2c/ov7670.c | 1 -
>> drivers/media/i2c/s5c73m3/s5c73m3-core.c | 1 -
>> drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 -
>> drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
>> drivers/media/i2c/saa6588.c | 1 -
>> drivers/media/i2c/saa6752hs.c | 1 -
>> drivers/media/i2c/saa7110.c | 1 -
>> drivers/media/i2c/saa7191.c | 1 -
>> drivers/media/i2c/soc_camera/mt9t112.c | 1 -
>> drivers/media/i2c/soc_camera/ov2640.c | 1 -
>> drivers/media/i2c/soc_camera/ov772x.c | 1 -
>> drivers/media/i2c/soc_camera/ov9640.c | 1 -
>> drivers/media/i2c/soc_camera/ov9740.c | 1 -
>> drivers/media/i2c/soc_camera/tw9910.c | 1 -
>> drivers/media/i2c/sony-btf-mpx.c | 1 -
>> drivers/media/i2c/tda7432.c | 1 -
>> drivers/media/i2c/tvaudio.c | 1 -
>> drivers/media/i2c/tw2804.c | 1 -
>> drivers/media/i2c/tw9903.c | 1 -
>> drivers/media/i2c/tw9906.c | 1 -
>> drivers/media/i2c/uda1342.c | 1 -
>> drivers/media/i2c/vpx3220.c | 1 -
>> drivers/media/i2c/vs6624.c | 1 -
>> drivers/media/pci/bt8xx/bttv-gpio.c | 1 -
>> drivers/media/pci/bt8xx/bttv-i2c.c | 1 -
>> drivers/media/pci/bt8xx/bttv-if.c | 1 -
>> drivers/media/pci/bt8xx/bttv-input.c | 1 -
>> drivers/media/pci/bt8xx/bttv-risc.c | 1 -
>> drivers/media/pci/bt8xx/dst.c | 1 -
>> drivers/media/pci/bt8xx/dst_ca.c | 1 -
>> drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 -
>> drivers/media/pci/cx18/cx18-driver.h | 1 -
>> drivers/media/pci/cx23885/cx23885-417.c | 1 -
>> drivers/media/pci/cx23885/cx23885-alsa.c | 1 -
>> drivers/media/pci/cx23885/cx23885-cards.c | 1 -
>> drivers/media/pci/cx23885/cx23885-dvb.c | 1 -
>> drivers/media/pci/cx23885/cx23885-i2c.c | 1 -
>> drivers/media/pci/cx23885/cx23885-vbi.c | 1 -
>> drivers/media/pci/cx23885/cx23885-video.c | 1 -
>> drivers/media/pci/cx25821/cx25821-alsa.c | 1 -
>> drivers/media/pci/cx25821/cx25821-audio-upstream.c | 1 -
>> drivers/media/pci/cx25821/cx25821-cards.c | 1 -
>> drivers/media/pci/cx25821/cx25821-video-upstream.c | 1 -
>> drivers/media/pci/cx25821/cx25821-video.h | 1 -
>> drivers/media/pci/cx88/cx88-alsa.c | 1 -
>> drivers/media/pci/cx88/cx88-cards.c | 1 -
>> drivers/media/pci/cx88/cx88-core.c | 1 -
>> drivers/media/pci/cx88/cx88-i2c.c | 1 -
>> drivers/media/pci/cx88/cx88-input.c | 1 -
>> drivers/media/pci/cx88/cx88-mpeg.c | 1 -
>> drivers/media/pci/cx88/cx88-tvaudio.c | 1 -
>> drivers/media/pci/cx88/cx88-vbi.c | 1 -
>> drivers/media/pci/cx88/cx88-video.c | 1 -
>> drivers/media/pci/cx88/cx88-vp3054-i2c.c | 1 -
>> drivers/media/pci/dm1105/dm1105.c | 1 -
>> drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 1 -
>> drivers/media/pci/ivtv/ivtv-driver.h | 1 -
>> drivers/media/pci/mantis/mantis_pci.c | 1 -
>> drivers/media/pci/ngene/ngene-core.c | 1 -
>> drivers/media/pci/ngene/ngene-dvb.c | 1 -
>> drivers/media/pci/ngene/ngene-i2c.c | 1 -
>> drivers/media/pci/pluto2/pluto2.c | 1 -
>> drivers/media/pci/saa7134/saa7134-alsa.c | 1 -
>> drivers/media/pci/saa7134/saa7134-cards.c | 1 -
>> drivers/media/pci/saa7134/saa7134-i2c.c | 1 -
>> drivers/media/pci/saa7134/saa7134-input.c | 1 -
>> drivers/media/pci/saa7134/saa7134-ts.c | 1 -
>> drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 -
>> drivers/media/pci/saa7134/saa7134-vbi.c | 1 -
>> drivers/media/pci/saa7134/saa7134-video.c | 1 -
>> drivers/media/pci/saa7164/saa7164-cards.c | 1 -
>> drivers/media/pci/saa7164/saa7164-i2c.c | 1 -
>> drivers/media/pci/ttpci/av7110_ir.c | 1 -
>> drivers/media/pci/ttpci/ttpci-eeprom.c | 1 -
>> drivers/media/pci/zoran/zoran_driver.c | 1 -
>> drivers/media/platform/blackfin/bfin_capture.c | 1 -
>> drivers/media/platform/davinci/vpbe.c | 1 -
>> drivers/media/platform/davinci/vpbe_display.c | 1 -
>> drivers/media/platform/davinci/vpbe_venc.c | 1 -
>> drivers/media/platform/davinci/vpfe_capture.c | 1 -
>> drivers/media/platform/fsl-viu.c | 1 -
>> drivers/media/platform/indycam.c | 1 -
>> drivers/media/platform/sh_vou.c | 1 -
>> drivers/media/platform/soc_camera/atmel-isi.c | 1 -
>> drivers/media/platform/soc_camera/mx2_camera.c | 1 -
>> drivers/media/platform/soc_camera/mx3_camera.c | 1 -
>> drivers/media/platform/soc_camera/pxa_camera.c | 1 -
>> drivers/media/platform/soc_camera/soc_camera.c | 1 -
>> drivers/media/platform/soc_camera/soc_camera_platform.c | 1 -
>> drivers/media/radio/dsbr100.c | 1 -
>> drivers/media/radio/radio-isa.c | 1 -
>> drivers/media/radio/radio-ma901.c | 1 -
>> drivers/media/radio/radio-maxiradio.c | 1 -
>> drivers/media/radio/radio-mr800.c | 1 -
>> drivers/media/radio/radio-raremono.c | 1 -
>> drivers/media/radio/radio-shark.c | 1 -
>> drivers/media/radio/radio-shark2.c | 1 -
>> drivers/media/radio/radio-tea5764.c | 1 -
>> drivers/media/radio/radio-tea5777.c | 1 -
>> drivers/media/radio/saa7706h.c | 1 -
>> drivers/media/radio/si470x/radio-si470x.h | 1 -
>> drivers/media/radio/si4713/radio-platform-si4713.c | 1 -
>> drivers/media/radio/si4713/radio-usb-si4713.c | 1 -
>> drivers/media/radio/tef6862.c | 1 -
>> drivers/media/rc/ati_remote.c | 1 -
>> drivers/media/rc/gpio-ir-recv.c | 1 -
>> drivers/media/rc/imon.c | 1 -
>> drivers/media/tuners/mt2063.c | 1 -
>> drivers/media/tuners/mxl5005s.c | 1 -
>> drivers/media/tuners/tda9887.c | 1 -
>> drivers/media/usb/au0828/au0828-dvb.c | 1 -
>> drivers/media/usb/au0828/au0828-i2c.c | 1 -
>> drivers/media/usb/au0828/au0828-vbi.c | 1 -
>> drivers/media/usb/au0828/au0828-video.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-417.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-cards.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-core.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 1 -
>> drivers/media/usb/cx231xx/cx231xx-vbi.c | 1 -
>> drivers/media/usb/cx231xx/cx231xx-video.c | 1 -
>> drivers/media/usb/dvb-usb/friio-fe.c | 1 -
>> drivers/media/usb/em28xx/em28xx-cards.c | 1 -
>> drivers/media/usb/em28xx/em28xx-core.c | 1 -
>> drivers/media/usb/em28xx/em28xx-vbi.c | 1 -
>> drivers/media/usb/em28xx/em28xx-video.c | 1 -
>> drivers/media/usb/hdpvr/hdpvr-control.c | 1 -
>> drivers/media/usb/hdpvr/hdpvr-core.c | 1 -
>> drivers/media/usb/hdpvr/hdpvr-video.c | 1 -
>> drivers/media/usb/pwc/pwc-if.c | 1 -
>> drivers/media/usb/pwc/pwc-v4l.c | 1 -
>> drivers/media/usb/siano/smsusb.c | 1 -
>> drivers/media/usb/stk1160/stk1160-core.c | 1 -
>> drivers/media/usb/stkwebcam/stk-webcam.c | 1 -
>> drivers/media/usb/tlg2300/pd-alsa.c | 1 -
>> drivers/media/usb/tlg2300/pd-radio.c | 1 -
>> drivers/media/usb/tm6000/tm6000-cards.c | 1 -
>> drivers/media/usb/tm6000/tm6000-input.c | 1 -
>> drivers/media/usb/tm6000/tm6000-video.c | 1 -
>> drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 1 -
>> drivers/media/usb/ttusb-dec/ttusb_dec.c | 1 -
>> drivers/media/usb/usbtv/usbtv.c | 1 -
>> drivers/media/usb/usbvision/usbvision-core.c | 1 -
>> drivers/media/usb/usbvision/usbvision-i2c.c | 1 -
>> drivers/media/usb/zr364xx/zr364xx.c | 1 -
>> drivers/media/v4l2-core/tuner-core.c | 1 -
>> drivers/media/v4l2-core/videobuf-core.c | 1 -
>> drivers/media/v4l2-core/videobuf-dma-contig.c | 1 -
>> drivers/media/v4l2-core/videobuf-dma-sg.c | 1 -
>> drivers/media/v4l2-core/videobuf-dvb.c | 1 -
>> drivers/media/v4l2-core/videobuf-vmalloc.c | 1 -
>> 223 files changed, 223 deletions(-)
>>
>> diff --git a/drivers/media/common/btcx-risc.c b/drivers/media/common/btcx-risc.c
>> index ac1b268..c39610e 100644
>> --- a/drivers/media/common/btcx-risc.c
>> +++ b/drivers/media/common/btcx-risc.c
>> @@ -23,7 +23,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/pci.h>
>> #include <linux/interrupt.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c
>> index 103ef6b..7639f5a 100644
>> --- a/drivers/media/common/cx2341x.c
>> +++ b/drivers/media/common/cx2341x.c
>> @@ -22,7 +22,6 @@
>> #include <linux/module.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/types.h>
>> #include <linux/videodev2.h>
>>
>> diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c
>> index 0bb4430..88fc961 100644
>> --- a/drivers/media/common/siano/smsdvb-debugfs.c
>> +++ b/drivers/media/common/siano/smsdvb-debugfs.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/debugfs.h>
>> #include <linux/spinlock.h>
>> #include <linux/usb.h>
>> diff --git a/drivers/media/common/tveeprom.c b/drivers/media/common/tveeprom.c
>> index c7dace6..7e94981 100644
>> --- a/drivers/media/common/tveeprom.c
>> +++ b/drivers/media/common/tveeprom.c
>> @@ -32,7 +32,6 @@
>> #include <linux/module.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/types.h>
>> #include <linux/videodev2.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
>> index a68974f..9b9c71c 100644
>> --- a/drivers/media/dvb-frontends/au8522_dig.c
>> +++ b/drivers/media/dvb-frontends/au8522_dig.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/dvb-frontends/au8522_priv.h b/drivers/media/dvb-frontends/au8522_priv.h
>> index aa0f16d..190d447 100644
>> --- a/drivers/media/dvb-frontends/au8522_priv.h
>> +++ b/drivers/media/dvb-frontends/au8522_priv.h
>> @@ -22,7 +22,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
>> index 39a29dd..1ebb46b 100644
>> --- a/drivers/media/dvb-frontends/bcm3510.c
>> +++ b/drivers/media/dvb-frontends/bcm3510.c
>> @@ -31,7 +31,6 @@
>> * Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/firmware.h>
>> diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
>> index 3d399d9..1f4031a 100644
>> --- a/drivers/media/dvb-frontends/cx22700.c
>> +++ b/drivers/media/dvb-frontends/cx22700.c
>> @@ -21,7 +21,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
>> index edc8eaf..7d6ce32 100644
>> --- a/drivers/media/dvb-frontends/cx22702.c
>> +++ b/drivers/media/dvb-frontends/cx22702.c
>> @@ -26,7 +26,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
>> index 95b981c..72f898e 100644
>> --- a/drivers/media/dvb-frontends/cx24110.c
>> +++ b/drivers/media/dvb-frontends/cx24110.c
>> @@ -25,7 +25,6 @@
>> #include <linux/slab.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>>
>> #include "dvb_frontend.h"
>> #include "cx24110.h"
>> diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
>> index 3883c3b..b7190a3 100644
>> --- a/drivers/media/dvb-frontends/cx24113.c
>> +++ b/drivers/media/dvb-frontends/cx24113.c
>> @@ -24,7 +24,6 @@
>> #include <linux/slab.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>>
>> #include "dvb_frontend.h"
>> #include "cx24113.h"
>> diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
>> index 2916d7c..4c4c3a0 100644
>> --- a/drivers/media/dvb-frontends/cx24116.c
>> +++ b/drivers/media/dvb-frontends/cx24116.c
>> @@ -38,7 +38,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/firmware.h>
>>
>> #include "dvb_frontend.h"
>> diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
>> index 68f768a..c61e113 100644
>> --- a/drivers/media/dvb-frontends/cx24117.c
>> +++ b/drivers/media/dvb-frontends/cx24117.c
>> @@ -28,7 +28,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/firmware.h>
>>
>> #include "tuner-i2c.h"
>> diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
>> index 72fb583..9c56f4a 100644
>> --- a/drivers/media/dvb-frontends/cx24123.c
>> +++ b/drivers/media/dvb-frontends/cx24123.c
>> @@ -25,7 +25,6 @@
>> #include <linux/slab.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <asm/div64.h>
>>
>> #include "dvb_frontend.h"
>> diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
>> index af91e0c..1b0eefc 100644
>> --- a/drivers/media/dvb-frontends/dib3000mb.c
>> +++ b/drivers/media/dvb-frontends/dib3000mb.c
>> @@ -23,7 +23,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
>> index 959ae36..d400579 100644
>> --- a/drivers/media/dvb-frontends/drxd_hard.c
>> +++ b/drivers/media/dvb-frontends/drxd_hard.c
>> @@ -24,7 +24,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
>> index bf29a3f..5fc7ad1 100644
>> --- a/drivers/media/dvb-frontends/drxk_hard.c
>> +++ b/drivers/media/dvb-frontends/drxk_hard.c
>> @@ -26,7 +26,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
>> index 1e344b0..97891f3 100644
>> --- a/drivers/media/dvb-frontends/ds3000.c
>> +++ b/drivers/media/dvb-frontends/ds3000.c
>> @@ -23,7 +23,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/firmware.h>
>>
>> #include "dvb_frontend.h"
>> diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
>> index d5acc30..14cc1fe 100644
>> --- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
>> +++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>>
>> diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
>> index 0c642a5..21c365c 100644
>> --- a/drivers/media/dvb-frontends/isl6405.c
>> +++ b/drivers/media/dvb-frontends/isl6405.c
>> @@ -26,7 +26,6 @@
>> */
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
>> index c77002f..0e3892f 100644
>> --- a/drivers/media/dvb-frontends/isl6421.c
>> +++ b/drivers/media/dvb-frontends/isl6421.c
>> @@ -26,7 +26,6 @@
>> */
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
>> index dca5beb..abe1f40 100644
>> --- a/drivers/media/dvb-frontends/isl6423.c
>> +++ b/drivers/media/dvb-frontends/isl6423.c
>> @@ -20,7 +20,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/it913x-fe.c b/drivers/media/dvb-frontends/it913x-fe.c
>> index 6e1c6eb..3a7724f 100644
>> --- a/drivers/media/dvb-frontends/it913x-fe.c
>> +++ b/drivers/media/dvb-frontends/it913x-fe.c
>> @@ -23,7 +23,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/types.h>
>>
>> diff --git a/drivers/media/dvb-frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
>> index ddf866c..ecbcc30 100644
>> --- a/drivers/media/dvb-frontends/l64781.c
>> +++ b/drivers/media/dvb-frontends/l64781.c
>> @@ -20,7 +20,6 @@
>>
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
>> index e046622..987275b 100644
>> --- a/drivers/media/dvb-frontends/lgdt330x.c
>> +++ b/drivers/media/dvb-frontends/lgdt330x.c
>> @@ -35,7 +35,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
>> index 416cce3..72152bd 100644
>> --- a/drivers/media/dvb-frontends/lgs8gl5.c
>> +++ b/drivers/media/dvb-frontends/lgs8gl5.c
>> @@ -21,7 +21,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
>> index f3ba7b5..e4ebb83 100644
>> --- a/drivers/media/dvb-frontends/lnbp21.c
>> +++ b/drivers/media/dvb-frontends/lnbp21.c
>> @@ -26,7 +26,6 @@
>> */
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
>> index c463da7..e3602f8 100644
>> --- a/drivers/media/dvb-frontends/lnbp22.c
>> +++ b/drivers/media/dvb-frontends/lnbp22.c
>> @@ -26,7 +26,6 @@
>> */
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
>> index b235146..4a2893a 100644
>> --- a/drivers/media/dvb-frontends/m88rs2000.c
>> +++ b/drivers/media/dvb-frontends/m88rs2000.c
>> @@ -22,7 +22,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>>
>> */
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/jiffies.h>
>> diff --git a/drivers/media/dvb-frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
>> index 9ae40ab..d02662a 100644
>> --- a/drivers/media/dvb-frontends/mb86a16.c
>> +++ b/drivers/media/dvb-frontends/mb86a16.c
>> @@ -18,7 +18,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
>> index a74ac0d..34d1410 100644
>> --- a/drivers/media/dvb-frontends/mt312.c
>> +++ b/drivers/media/dvb-frontends/mt312.c
>> @@ -26,7 +26,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
>> index 2c3b50e..baf231c 100644
>> --- a/drivers/media/dvb-frontends/mt352.c
>> +++ b/drivers/media/dvb-frontends/mt352.c
>> @@ -32,7 +32,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
>> index 4bf0575..c63b03a 100644
>> --- a/drivers/media/dvb-frontends/nxt200x.c
>> +++ b/drivers/media/dvb-frontends/nxt200x.c
>> @@ -47,7 +47,6 @@
>> #define CRC_CCIT_MASK 0x1021
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
>> index 90ae6c7..0cc0bc6 100644
>> --- a/drivers/media/dvb-frontends/nxt6000.c
>> +++ b/drivers/media/dvb-frontends/nxt6000.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
>> index 5ef9218..236fa19 100644
>> --- a/drivers/media/dvb-frontends/or51132.c
>> +++ b/drivers/media/dvb-frontends/or51132.c
>> @@ -36,7 +36,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
>> index f71b062..4ade31b 100644
>> --- a/drivers/media/dvb-frontends/s5h1409.c
>> +++ b/drivers/media/dvb-frontends/s5h1409.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
>> index 6cc4b7a..3839886 100644
>> --- a/drivers/media/dvb-frontends/s5h1411.c
>> +++ b/drivers/media/dvb-frontends/s5h1411.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
>> index 93eeaf7..7814c13 100644
>> --- a/drivers/media/dvb-frontends/s5h1420.c
>> +++ b/drivers/media/dvb-frontends/s5h1420.c
>> @@ -24,7 +24,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
>> index 6ec16a2..f3135b8 100644
>> --- a/drivers/media/dvb-frontends/s5h1432.c
>> +++ b/drivers/media/dvb-frontends/s5h1432.c
>> @@ -19,7 +19,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
>> index 73b47cc..b21cb00 100644
>> --- a/drivers/media/dvb-frontends/si21xx.c
>> +++ b/drivers/media/dvb-frontends/si21xx.c
>> @@ -8,7 +8,6 @@
>> * (at your option) any later version.
>> *
>> */
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
>> index 2aa8ef7..f5fc713 100644
>> --- a/drivers/media/dvb-frontends/sp8870.c
>> +++ b/drivers/media/dvb-frontends/sp8870.c
>> @@ -27,7 +27,6 @@
>> */
>> #define SP8870_DEFAULT_FIRMWARE "dvb-fe-sp8870.fw"
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/firmware.h>
>> diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
>> index 1bb81b5..f326955 100644
>> --- a/drivers/media/dvb-frontends/sp887x.c
>> +++ b/drivers/media/dvb-frontends/sp887x.c
>> @@ -10,7 +10,6 @@
>> */
>> #define SP887X_DEFAULT_FIRMWARE "dvb-fe-sp887x.fw"
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/firmware.h>
>> diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
>> index 07cd5ea..7fabfbd 100644
>> --- a/drivers/media/dvb-frontends/stb0899_drv.c
>> +++ b/drivers/media/dvb-frontends/stb0899_drv.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
>> index cea175d..4265e40 100644
>> --- a/drivers/media/dvb-frontends/stb6100.c
>> +++ b/drivers/media/dvb-frontends/stb6100.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
>> index 632b251..8731001 100644
>> --- a/drivers/media/dvb-frontends/stv0288.c
>> +++ b/drivers/media/dvb-frontends/stv0288.c
>> @@ -25,7 +25,6 @@
>>
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
>> index d40f226..18903e5 100644
>> --- a/drivers/media/dvb-frontends/stv0297.c
>> +++ b/drivers/media/dvb-frontends/stv0297.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
>> index b57ecf4..baccefd 100644
>> --- a/drivers/media/dvb-frontends/stv0299.c
>> +++ b/drivers/media/dvb-frontends/stv0299.c
>> @@ -42,7 +42,6 @@
>>
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
>> index 23e872f..9160cd1 100644
>> --- a/drivers/media/dvb-frontends/stv090x.c
>> +++ b/drivers/media/dvb-frontends/stv090x.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
>> index e66154e..9e1078e 100644
>> --- a/drivers/media/dvb-frontends/stv6110x.c
>> +++ b/drivers/media/dvb-frontends/stv6110x.c
>> @@ -20,7 +20,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
>> index 1bff7f4..3558a54 100644
>> --- a/drivers/media/dvb-frontends/tda10021.c
>> +++ b/drivers/media/dvb-frontends/tda10021.c
>> @@ -23,7 +23,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
>> index ca1e0d5..f8193a5 100644
>> --- a/drivers/media/dvb-frontends/tda10023.c
>> +++ b/drivers/media/dvb-frontends/tda10023.c
>> @@ -27,7 +27,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
>> index 71fb632..80adcb3 100644
>> --- a/drivers/media/dvb-frontends/tda10048.c
>> +++ b/drivers/media/dvb-frontends/tda10048.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
>> index a2631be..d99a5dd 100644
>> --- a/drivers/media/dvb-frontends/tda1004x.c
>> +++ b/drivers/media/dvb-frontends/tda1004x.c
>> @@ -29,7 +29,6 @@
>> #define TDA10045_DEFAULT_FIRMWARE "dvb-fe-tda10045.fw"
>> #define TDA10046_DEFAULT_FIRMWARE "dvb-fe-tda10046.fw"
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/jiffies.h>
>> diff --git a/drivers/media/dvb-frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
>> index fcfe2e0..5d8ee20 100644
>> --- a/drivers/media/dvb-frontends/tda10086.c
>> +++ b/drivers/media/dvb-frontends/tda10086.c
>> @@ -20,7 +20,6 @@
>>
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/device.h>
>> #include <linux/jiffies.h>
>> diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
>> index 2c54586..2653c06 100644
>> --- a/drivers/media/dvb-frontends/tda18271c2dd.c
>> +++ b/drivers/media/dvb-frontends/tda18271c2dd.c
>> @@ -25,7 +25,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
>> index 63cc123..bf9f94b 100644
>> --- a/drivers/media/dvb-frontends/tda665x.c
>> +++ b/drivers/media/dvb-frontends/tda665x.c
>> @@ -17,7 +17,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
>> index 69e62f4..c5c1f59 100644
>> --- a/drivers/media/dvb-frontends/tda8083.c
>> +++ b/drivers/media/dvb-frontends/tda8083.c
>> @@ -24,7 +24,6 @@
>>
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
>> index 19c4888..78ee1df 100644
>> --- a/drivers/media/dvb-frontends/tda8261.c
>> +++ b/drivers/media/dvb-frontends/tda8261.c
>> @@ -18,7 +18,6 @@
>> */
>>
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/dvb-frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
>> index bb42b56..53090a5 100644
>> --- a/drivers/media/dvb-frontends/ves1820.c
>> +++ b/drivers/media/dvb-frontends/ves1820.c
>> @@ -20,7 +20,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/dvb-frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
>> index 9c17eac..0cbaf19 100644
>> --- a/drivers/media/dvb-frontends/ves1x93.c
>> +++ b/drivers/media/dvb-frontends/ves1x93.c
>> @@ -25,7 +25,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
>> index 91b6b2e..575ac33 100644
>> --- a/drivers/media/dvb-frontends/zl10039.c
>> +++ b/drivers/media/dvb-frontends/zl10039.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> #include <linux/dvb/frontend.h>
>> diff --git a/drivers/media/dvb-frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
>> index 82946cd..92cc0c3 100644
>> --- a/drivers/media/dvb-frontends/zl10353.c
>> +++ b/drivers/media/dvb-frontends/zl10353.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
>> index d7d99f1..45db360 100644
>> --- a/drivers/media/i2c/adv7180.c
>> +++ b/drivers/media/i2c/adv7180.c
>> @@ -19,7 +19,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> #include <linux/interrupt.h>
>> diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
>> index d45e0e3..c319584 100644
>> --- a/drivers/media/i2c/adv7183.c
>> +++ b/drivers/media/i2c/adv7183.c
>> @@ -21,7 +21,6 @@
>> #include <linux/errno.h>
>> #include <linux/gpio.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/types.h>
>> diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
>> index d4e15a6..a3e207e 100644
>> --- a/drivers/media/i2c/adv7343.c
>> +++ b/drivers/media/i2c/adv7343.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/ctype.h>
>> #include <linux/slab.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/i2c/adv7393.c b/drivers/media/i2c/adv7393.c
>> index 558f191..a519aa5 100644
>> --- a/drivers/media/i2c/adv7393.c
>> +++ b/drivers/media/i2c/adv7393.c
>> @@ -21,7 +21,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/ctype.h>
>> #include <linux/slab.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
>> index c14e667..b8f395e 100644
>> --- a/drivers/media/i2c/ak881x.c
>> +++ b/drivers/media/i2c/ak881x.c
>> @@ -9,7 +9,6 @@
>> */
>>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/slab.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
>> index 99ee456..f74e26b 100644
>> --- a/drivers/media/i2c/ir-kbd-i2c.c
>> +++ b/drivers/media/i2c/ir-kbd-i2c.c
>> @@ -36,7 +36,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/string.h>
>> #include <linux/timer.h>
>> diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
>> index c3e94ae..830c84f 100644
>> --- a/drivers/media/i2c/ks0127.c
>> +++ b/drivers/media/i2c/ks0127.c
>> @@ -33,7 +33,6 @@
>> * V1.1 Gerard v.d. Horst Added some debugoutput, reset the video-standard
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
>> index a9110d8..5775a6e 100644
>> --- a/drivers/media/i2c/ml86v7667.c
>> +++ b/drivers/media/i2c/ml86v7667.c
>> @@ -11,7 +11,6 @@
>> * option) any later version.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c
>> index 85ec3ba..d20568b 100644
>> --- a/drivers/media/i2c/mt9m032.c
>> +++ b/drivers/media/i2c/mt9m032.c
>> @@ -22,7 +22,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/math64.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/i2c/ov7640.c b/drivers/media/i2c/ov7640.c
>> index faa64ba..0171198 100644
>> --- a/drivers/media/i2c/ov7640.c
>> +++ b/drivers/media/i2c/ov7640.c
>> @@ -15,7 +15,6 @@
>> * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
>> index e8a1ce2..8e45ba2 100644
>> --- a/drivers/media/i2c/ov7670.c
>> +++ b/drivers/media/i2c/ov7670.c
>> @@ -10,7 +10,6 @@
>> * This file may be distributed under the terms of the GNU General
>> * Public License, version 2.
>> */
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
>> index e7f555c..56a979f 100644
>> --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
>> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
>> @@ -20,7 +20,6 @@
>> #include <linux/firmware.h>
>> #include <linux/gpio.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/media.h>
>> #include <linux/module.h>
>> #include <linux/regulator/consumer.h>
>> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
>> index 8001cde..e6a23a1 100644
>> --- a/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
>> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
>> @@ -20,7 +20,6 @@
>> #include <linux/firmware.h>
>> #include <linux/gpio.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/media.h>
>> #include <linux/module.h>
>> #include <linux/regulator/consumer.h>
>> diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
>> index 8079e26..09b3890 100644
>> --- a/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
>> +++ b/drivers/media/i2c/s5c73m3/s5c73m3-spi.c
>> @@ -17,7 +17,6 @@
>>
>> #include <linux/sizes.h>
>> #include <linux/delay.h>
>> -#include <linux/init.h>
>> #include <linux/media.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
>> index 2960b5a..18c42ca 100644
>> --- a/drivers/media/i2c/saa6588.c
>> +++ b/drivers/media/i2c/saa6588.c
>> @@ -24,7 +24,6 @@
>> #include <linux/i2c.h>
>> #include <linux/types.h>
>> #include <linux/videodev2.h>
>> -#include <linux/init.h>
>> #include <linux/errno.h>
>> #include <linux/slab.h>
>> #include <linux/poll.h>
>> diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
>> index 8272c0b..234ea56 100644
>> --- a/drivers/media/i2c/saa6752hs.c
>> +++ b/drivers/media/i2c/saa6752hs.c
>> @@ -33,7 +33,6 @@
>> #include <linux/i2c.h>
>> #include <linux/types.h>
>> #include <linux/videodev2.h>
>> -#include <linux/init.h>
>> #include <linux/crc32.h>
>> #include <media/v4l2-device.h>
>> #include <media/v4l2-ctrls.h>
>> diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
>> index ac43e92..88d6cb9 100644
>> --- a/drivers/media/i2c/saa7110.c
>> +++ b/drivers/media/i2c/saa7110.c
>> @@ -26,7 +26,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/types.h>
>> #include <linux/delay.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/saa7191.c b/drivers/media/i2c/saa7191.c
>> index 606a4ba..c129152 100644
>> --- a/drivers/media/i2c/saa7191.c
>> +++ b/drivers/media/i2c/saa7191.c
>> @@ -12,7 +12,6 @@
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> #include <linux/fs.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/major.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
>> index 46f431a..00e014d 100644
>> --- a/drivers/media/i2c/soc_camera/mt9t112.c
>> +++ b/drivers/media/i2c/soc_camera/mt9t112.c
>> @@ -19,7 +19,6 @@
>>
>> #include <linux/delay.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/v4l2-mediabus.h>
>> diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
>> index 6c6b1c3..5f2210b 100644
>> --- a/drivers/media/i2c/soc_camera/ov2640.c
>> +++ b/drivers/media/i2c/soc_camera/ov2640.c
>> @@ -13,7 +13,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
>> index 7f2b3c8..7bcbaac 100644
>> --- a/drivers/media/i2c/soc_camera/ov772x.c
>> +++ b/drivers/media/i2c/soc_camera/ov772x.c
>> @@ -15,7 +15,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
>> index bc74224..28aac74 100644
>> --- a/drivers/media/i2c/soc_camera/ov9640.c
>> +++ b/drivers/media/i2c/soc_camera/ov9640.c
>> @@ -19,7 +19,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
>> index ea76863..3dbd1ba 100644
>> --- a/drivers/media/i2c/soc_camera/ov9740.c
>> +++ b/drivers/media/i2c/soc_camera/ov9740.c
>> @@ -10,7 +10,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
>> index ab54628..f35882b 100644
>> --- a/drivers/media/i2c/soc_camera/tw9910.c
>> +++ b/drivers/media/i2c/soc_camera/tw9910.c
>> @@ -16,7 +16,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/sony-btf-mpx.c b/drivers/media/i2c/sony-btf-mpx.c
>> index 32d8232..c2eede1 100644
>> --- a/drivers/media/i2c/sony-btf-mpx.c
>> +++ b/drivers/media/i2c/sony-btf-mpx.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> #include <media/tuner.h>
>> diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
>> index 72af644..ae5749d 100644
>> --- a/drivers/media/i2c/tda7432.c
>> +++ b/drivers/media/i2c/tda7432.c
>> @@ -23,7 +23,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/string.h>
>> #include <linux/timer.h>
>> diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
>> index d76c53a8..b17b484 100644
>> --- a/drivers/media/i2c/tvaudio.c
>> +++ b/drivers/media/i2c/tvaudio.c
>> @@ -32,7 +32,6 @@
>> #include <linux/slab.h>
>> #include <linux/videodev2.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/kthread.h>
>> #include <linux/freezer.h>
>>
>> diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
>> index f58607d..840067b 100644
>> --- a/drivers/media/i2c/tw2804.c
>> +++ b/drivers/media/i2c/tw2804.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> #include <linux/ioctl.h>
>> diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c
>> index 285b759..8dde4c7 100644
>> --- a/drivers/media/i2c/tw9903.c
>> +++ b/drivers/media/i2c/tw9903.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> #include <linux/ioctl.h>
>> diff --git a/drivers/media/i2c/tw9906.c b/drivers/media/i2c/tw9906.c
>> index f6bef25..5ec7a8d 100644
>> --- a/drivers/media/i2c/tw9906.c
>> +++ b/drivers/media/i2c/tw9906.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> #include <linux/ioctl.h>
>> diff --git a/drivers/media/i2c/uda1342.c b/drivers/media/i2c/uda1342.c
>> index 081786d..2c20ac22 100644
>> --- a/drivers/media/i2c/uda1342.c
>> +++ b/drivers/media/i2c/uda1342.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> #include <media/v4l2-device.h>
>> diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
>> index ece90df..32ceaf4 100644
>> --- a/drivers/media/i2c/vpx3220.c
>> +++ b/drivers/media/i2c/vpx3220.c
>> @@ -19,7 +19,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/types.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
>> index 23f4f65..f8a80db 100644
>> --- a/drivers/media/i2c/vs6624.c
>> +++ b/drivers/media/i2c/vs6624.c
>> @@ -21,7 +21,6 @@
>> #include <linux/errno.h>
>> #include <linux/gpio.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/types.h>
>> diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
>> index 922e823..2cc95b1 100644
>> --- a/drivers/media/pci/bt8xx/bttv-gpio.c
>> +++ b/drivers/media/pci/bt8xx/bttv-gpio.c
>> @@ -29,7 +29,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/device.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
>> index d43911d..2d5c451 100644
>> --- a/drivers/media/pci/bt8xx/bttv-i2c.c
>> +++ b/drivers/media/pci/bt8xx/bttv-i2c.c
>> @@ -30,7 +30,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>>
>> #include "bttvp.h"
>> diff --git a/drivers/media/pci/bt8xx/bttv-if.c b/drivers/media/pci/bt8xx/bttv-if.c
>> index a6a540d..075eb78 100644
>> --- a/drivers/media/pci/bt8xx/bttv-if.c
>> +++ b/drivers/media/pci/bt8xx/bttv-if.c
>> @@ -27,7 +27,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <asm/io.h>
>>
>> diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
>> index f368213..1f17971 100644
>> --- a/drivers/media/pci/bt8xx/bttv-input.c
>> +++ b/drivers/media/pci/bt8xx/bttv-input.c
>> @@ -21,7 +21,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/interrupt.h>
>> #include <linux/input.h>
>> diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
>> index 82cc47d..bcea329 100644
>> --- a/drivers/media/pci/bt8xx/bttv-risc.c
>> +++ b/drivers/media/pci/bt8xx/bttv-risc.c
>> @@ -27,7 +27,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/pci.h>
>> #include <linux/vmalloc.h>
>> diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
>> index 430b3eb..bbc901c 100644
>> --- a/drivers/media/pci/bt8xx/dst.c
>> +++ b/drivers/media/pci/bt8xx/dst.c
>> @@ -20,7 +20,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> #include <linux/vmalloc.h>
>> diff --git a/drivers/media/pci/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
>> index 0e788fc..4e36cf6 100644
>> --- a/drivers/media/pci/bt8xx/dst_ca.c
>> +++ b/drivers/media/pci/bt8xx/dst_ca.c
>> @@ -21,7 +21,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/mutex.h>
>> #include <linux/string.h>
>> #include <linux/dvb/ca.h>
>> diff --git a/drivers/media/pci/cx18/cx18-alsa-pcm.c b/drivers/media/pci/cx18/cx18-alsa-pcm.c
>> index 180077c..e65616d 100644
>> --- a/drivers/media/pci/cx18/cx18-alsa-pcm.c
>> +++ b/drivers/media/pci/cx18/cx18-alsa-pcm.c
>> @@ -23,7 +23,6 @@
>> * 02111-1307 USA
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/vmalloc.h>
>>
>> diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h
>> index 57f4688..57ef0d8 100644
>> --- a/drivers/media/pci/cx18/cx18-driver.h
>> +++ b/drivers/media/pci/cx18/cx18-driver.h
>> @@ -27,7 +27,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/sched.h>
>> #include <linux/fs.h>
>> diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
>> index 95666ee..47313cf 100644
>> --- a/drivers/media/pci/cx23885/cx23885-417.c
>> +++ b/drivers/media/pci/cx23885/cx23885-417.c
>> @@ -26,7 +26,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/fs.h>
>> #include <linux/delay.h>
>> #include <linux/device.h>
>> diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
>> index c6c9bd5..771311a 100644
>> --- a/drivers/media/pci/cx23885/cx23885-alsa.c
>> +++ b/drivers/media/pci/cx23885/cx23885-alsa.c
>> @@ -22,7 +22,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/interrupt.h>
>> #include <linux/vmalloc.h>
>> diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
>> index 79f20c8..0a2cd9f 100644
>> --- a/drivers/media/pci/cx23885/cx23885-cards.c
>> +++ b/drivers/media/pci/cx23885/cx23885-cards.c
>> @@ -19,7 +19,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
>> index 0549205..f1a563f 100644
>> --- a/drivers/media/pci/cx23885/cx23885-dvb.c
>> +++ b/drivers/media/pci/cx23885/cx23885-dvb.c
>> @@ -20,7 +20,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/fs.h>
>> #include <linux/kthread.h>
>> diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c
>> index 4887314..6d6345e 100644
>> --- a/drivers/media/pci/cx23885/cx23885-i2c.c
>> +++ b/drivers/media/pci/cx23885/cx23885-i2c.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <asm/io.h>
>>
>> diff --git a/drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/pci/cx23885/cx23885-vbi.c
>> index a1154f0..332b40b 100644
>> --- a/drivers/media/pci/cx23885/cx23885-vbi.c
>> +++ b/drivers/media/pci/cx23885/cx23885-vbi.c
>> @@ -22,7 +22,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>>
>> #include "cx23885.h"
>>
>> diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
>> index 7891f34..68bfee8 100644
>> --- a/drivers/media/pci/cx23885/cx23885-video.c
>> +++ b/drivers/media/pci/cx23885/cx23885-video.c
>> @@ -19,7 +19,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
>> index b1e08c3..5f6b88b 100644
>> --- a/drivers/media/pci/cx25821/cx25821-alsa.c
>> +++ b/drivers/media/pci/cx25821/cx25821-alsa.c
>> @@ -23,7 +23,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/interrupt.h>
>> #include <linux/vmalloc.h>
>> diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
>> index 68dbc2d..0c7bb8c 100644
>> --- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
>> +++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
>> @@ -28,7 +28,6 @@
>> #include <linux/fs.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/syscalls.h>
>> #include <linux/file.h>
>> diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
>> index f2ebc98..c35c71e 100644
>> --- a/drivers/media/pci/cx25821/cx25821-cards.c
>> +++ b/drivers/media/pci/cx25821/cx25821-cards.c
>> @@ -23,7 +23,6 @@
>>
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>>
>> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
>> index 1f43be0..db76689 100644
>> --- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
>> +++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
>> @@ -27,7 +27,6 @@
>>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>>
>> diff --git a/drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/pci/cx25821/cx25821-video.h
>> index ab63b38..79216c6 100644
>> --- a/drivers/media/pci/cx25821/cx25821-video.h
>> +++ b/drivers/media/pci/cx25821/cx25821-video.h
>> @@ -24,7 +24,6 @@
>> #ifndef CX25821_VIDEO_H_
>> #define CX25821_VIDEO_H_
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
>> index d014206e..218f64a 100644
>> --- a/drivers/media/pci/cx88/cx88-alsa.c
>> +++ b/drivers/media/pci/cx88/cx88-alsa.c
>> @@ -25,7 +25,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/interrupt.h>
>> #include <linux/vmalloc.h>
>> diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
>> index e18a7ac..7584afc 100644
>> --- a/drivers/media/pci/cx88/cx88-cards.c
>> +++ b/drivers/media/pci/cx88/cx88-cards.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
>> index ad59dc9..bf04477 100644
>> --- a/drivers/media/pci/cx88/cx88-core.c
>> +++ b/drivers/media/pci/cx88/cx88-core.c
>> @@ -25,7 +25,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/cx88/cx88-i2c.c b/drivers/media/pci/cx88/cx88-i2c.c
>> index cf2d696..4f80bb5 100644
>> --- a/drivers/media/pci/cx88/cx88-i2c.c
>> +++ b/drivers/media/pci/cx88/cx88-i2c.c
>> @@ -28,7 +28,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>>
>> #include <asm/io.h>
>>
>> diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
>> index f29e18c..9de7287 100644
>> --- a/drivers/media/pci/cx88/cx88-input.c
>> +++ b/drivers/media/pci/cx88/cx88-input.c
>> @@ -22,7 +22,6 @@
>> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/hrtimer.h>
>> #include <linux/pci.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
>> index 74b7b86..fb8e78f 100644
>> --- a/drivers/media/pci/cx88/cx88-mpeg.c
>> +++ b/drivers/media/pci/cx88/cx88-mpeg.c
>> @@ -24,7 +24,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/dma-mapping.h>
>> #include <linux/interrupt.h>
>> diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c
>> index 424fd97..43c53b5 100644
>> --- a/drivers/media/pci/cx88/cx88-tvaudio.c
>> +++ b/drivers/media/pci/cx88/cx88-tvaudio.c
>> @@ -46,7 +46,6 @@
>> #include <linux/types.h>
>> #include <linux/interrupt.h>
>> #include <linux/vmalloc.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/kthread.h>
>>
>> diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c
>> index f8f8389..2ea1190 100644
>> --- a/drivers/media/pci/cx88/cx88-vbi.c
>> +++ b/drivers/media/pci/cx88/cx88-vbi.c
>> @@ -2,7 +2,6 @@
>> */
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>>
>> #include "cx88.h"
>>
>> diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
>> index ed8cb90..7401bcb 100644
>> --- a/drivers/media/pci/cx88/cx88-video.c
>> +++ b/drivers/media/pci/cx88/cx88-video.c
>> @@ -25,7 +25,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kmod.h>
>> diff --git a/drivers/media/pci/cx88/cx88-vp3054-i2c.c b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
>> index deede6e..742bfca 100644
>> --- a/drivers/media/pci/cx88/cx88-vp3054-i2c.c
>> +++ b/drivers/media/pci/cx88/cx88-vp3054-i2c.c
>> @@ -24,7 +24,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>>
>> #include <asm/io.h>
>>
>> diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
>> index e60ac35..419194f 100644
>> --- a/drivers/media/pci/dm1105/dm1105.c
>> +++ b/drivers/media/pci/dm1105/dm1105.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/i2c.h>
>> #include <linux/i2c-algo-bit.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
>> index e1863db..9fd932b 100644
>> --- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
>> +++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
>> @@ -23,7 +23,6 @@
>> * 02111-1307 USA
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/vmalloc.h>
>>
>> diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
>> index bc309f42c..408343a 100644
>> --- a/drivers/media/pci/ivtv/ivtv-driver.h
>> +++ b/drivers/media/pci/ivtv/ivtv-driver.h
>> @@ -37,7 +37,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/sched.h>
>> #include <linux/fs.h>
>> diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
>> index 9e89e04..fbf0182 100644
>> --- a/drivers/media/pci/mantis/mantis_pci.c
>> +++ b/drivers/media/pci/mantis/mantis_pci.c
>> @@ -25,7 +25,6 @@
>> #include <asm/page.h>
>> #include <linux/kmod.h>
>> #include <linux/vmalloc.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/pci.h>
>>
>> diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
>> index 970e833..1eec301 100644
>> --- a/drivers/media/pci/ngene/ngene-core.c
>> +++ b/drivers/media/pci/ngene/ngene-core.c
>> @@ -28,7 +28,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/poll.h>
>> #include <linux/io.h>
>> diff --git a/drivers/media/pci/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c
>> index fcb16a6..e94b4d5 100644
>> --- a/drivers/media/pci/ngene/ngene-dvb.c
>> +++ b/drivers/media/pci/ngene/ngene-dvb.c
>> @@ -28,7 +28,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/slab.h>
>> #include <linux/poll.h>
>> diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
>> index d28554f..434caf0 100644
>> --- a/drivers/media/pci/ngene/ngene-i2c.c
>> +++ b/drivers/media/pci/ngene/ngene-i2c.c
>> @@ -29,7 +29,6 @@
>>
>> /* FIXME - some of these can probably be removed */
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/slab.h>
>> #include <linux/poll.h>
>> diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
>> index 655d6854..8293eb7 100644
>> --- a/drivers/media/pci/pluto2/pluto2.c
>> +++ b/drivers/media/pci/pluto2/pluto2.c
>> @@ -25,7 +25,6 @@
>>
>> #include <linux/i2c.h>
>> #include <linux/i2c-algo-bit.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
>> index dd67c8a..33e22c1 100644
>> --- a/drivers/media/pci/saa7134/saa7134-alsa.c
>> +++ b/drivers/media/pci/saa7134/saa7134-alsa.c
>> @@ -16,7 +16,6 @@
>> *
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/time.h>
>> #include <linux/wait.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
>> index d45e7f6..9ae7ca2 100644
>> --- a/drivers/media/pci/saa7134/saa7134-cards.c
>> +++ b/drivers/media/pci/saa7134/saa7134-cards.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/i2c.h>
>> #include <linux/i2c-algo-bit.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
>> index c68169d..c71abff 100644
>> --- a/drivers/media/pci/saa7134/saa7134-i2c.c
>> +++ b/drivers/media/pci/saa7134/saa7134-i2c.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
>> index 6f43126..255a35e 100644
>> --- a/drivers/media/pci/saa7134/saa7134-input.c
>> +++ b/drivers/media/pci/saa7134/saa7134-input.c
>> @@ -19,7 +19,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/interrupt.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
>> index 2e3f4b4..6957176 100644
>> --- a/drivers/media/pci/saa7134/saa7134-ts.c
>> +++ b/drivers/media/pci/saa7134/saa7134-ts.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
>> index 0f34e09..ed532f4 100644
>> --- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
>> +++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
>> index d4da18d..ce80d7c 100644
>> --- a/drivers/media/pci/saa7134/saa7134-vbi.c
>> +++ b/drivers/media/pci/saa7134/saa7134-vbi.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
>> index eb472b5..6d05685 100644
>> --- a/drivers/media/pci/saa7134/saa7134-video.c
>> +++ b/drivers/media/pci/saa7134/saa7134-video.c
>> @@ -20,7 +20,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/saa7164/saa7164-cards.c b/drivers/media/pci/saa7164/saa7164-cards.c
>> index 5b72da5..4698daa 100644
>> --- a/drivers/media/pci/saa7164/saa7164-cards.c
>> +++ b/drivers/media/pci/saa7164/saa7164-cards.c
>> @@ -19,7 +19,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c
>> index 4f7e3b4..a9a0c8d 100644
>> --- a/drivers/media/pci/saa7164/saa7164-i2c.c
>> +++ b/drivers/media/pci/saa7164/saa7164-i2c.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/io.h>
>>
>> diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
>> index 0e763a7..c77222d 100644
>> --- a/drivers/media/pci/ttpci/av7110_ir.c
>> +++ b/drivers/media/pci/ttpci/av7110_ir.c
>> @@ -23,7 +23,6 @@
>>
>>
>> #include <linux/types.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/proc_fs.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/pci/ttpci/ttpci-eeprom.c b/drivers/media/pci/ttpci/ttpci-eeprom.c
>> index 32d4315..862552b 100644
>> --- a/drivers/media/pci/ttpci/ttpci-eeprom.c
>> +++ b/drivers/media/pci/ttpci/ttpci-eeprom.c
>> @@ -32,7 +32,6 @@
>> */
>>
>> #include <asm/errno.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
>> index e7e9840..6c4ab66 100644
>> --- a/drivers/media/pci/zoran/zoran_driver.c
>> +++ b/drivers/media/pci/zoran/zoran_driver.c
>> @@ -44,7 +44,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/delay.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
>> index 2819165..119bc0a 100644
>> --- a/drivers/media/platform/blackfin/bfin_capture.c
>> +++ b/drivers/media/platform/blackfin/bfin_capture.c
>> @@ -22,7 +22,6 @@
>> #include <linux/errno.h>
>> #include <linux/fs.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/io.h>
>> #include <linux/mm.h>
>> diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
>> index 33b9660..fb86341 100644
>> --- a/drivers/media/platform/davinci/vpbe.c
>> +++ b/drivers/media/platform/davinci/vpbe.c
>> @@ -15,7 +15,6 @@
>> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> */
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/errno.h>
>> #include <linux/fs.h>
>> diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
>> index b02aba4..7d73561 100644
>> --- a/drivers/media/platform/davinci/vpbe_display.c
>> +++ b/drivers/media/platform/davinci/vpbe_display.c
>> @@ -11,7 +11,6 @@
>> * GNU General Public License for more details.
>> */
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/errno.h>
>> #include <linux/interrupt.h>
>> diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
>> index 14a023a..62a4cd3 100644
>> --- a/drivers/media/platform/davinci/vpbe_venc.c
>> +++ b/drivers/media/platform/davinci/vpbe_venc.c
>> @@ -16,7 +16,6 @@
>> */
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/ctype.h>
>> #include <linux/delay.h>
>> #include <linux/device.h>
>> diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
>> index d762246..3253714 100644
>> --- a/drivers/media/platform/davinci/vpfe_capture.c
>> +++ b/drivers/media/platform/davinci/vpfe_capture.c
>> @@ -68,7 +68,6 @@
>> */
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/interrupt.h>
>> #include <media/v4l2-common.h>
>> diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
>> index dbf0ce3..9a6c4c0 100644
>> --- a/drivers/media/platform/fsl-viu.c
>> +++ b/drivers/media/platform/fsl-viu.c
>> @@ -18,7 +18,6 @@
>> #include <linux/clk.h>
>> #include <linux/kernel.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/io.h>
>> #include <linux/of_address.h>
>> diff --git a/drivers/media/platform/indycam.c b/drivers/media/platform/indycam.c
>> index f1d192b..27c0669 100644
>> --- a/drivers/media/platform/indycam.c
>> +++ b/drivers/media/platform/indycam.c
>> @@ -12,7 +12,6 @@
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> #include <linux/fs.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/major.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
>> index e5f1d4c..42c4b90 100644
>> --- a/drivers/media/platform/sh_vou.c
>> +++ b/drivers/media/platform/sh_vou.c
>> @@ -13,7 +13,6 @@
>> #include <linux/errno.h>
>> #include <linux/fs.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/kernel.h>
>> #include <linux/platform_device.h>
>> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
>> index 4835173..78240a6 100644
>> --- a/drivers/media/platform/soc_camera/atmel-isi.c
>> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
>> @@ -15,7 +15,6 @@
>> #include <linux/completion.h>
>> #include <linux/delay.h>
>> #include <linux/fs.h>
>> -#include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
>> index d73abca..ac9af48 100644
>> --- a/drivers/media/platform/soc_camera/mx2_camera.c
>> +++ b/drivers/media/platform/soc_camera/mx2_camera.c
>> @@ -11,7 +11,6 @@
>> * (at your option) any later version.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/io.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
>> index f975b70..0e915db 100644
>> --- a/drivers/media/platform/soc_camera/mx3_camera.c
>> +++ b/drivers/media/platform/soc_camera/mx3_camera.c
>> @@ -9,7 +9,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/videodev2.h>
>> #include <linux/platform_device.h>
>> diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
>> index d4df305..f918282 100644
>> --- a/drivers/media/platform/soc_camera/pxa_camera.c
>> +++ b/drivers/media/platform/soc_camera/pxa_camera.c
>> @@ -10,7 +10,6 @@
>> * (at your option) any later version.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/io.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
>> index 4b8c024..197fbdf 100644
>> --- a/drivers/media/platform/soc_camera/soc_camera.c
>> +++ b/drivers/media/platform/soc_camera/soc_camera.c
>> @@ -19,7 +19,6 @@
>> #include <linux/device.h>
>> #include <linux/err.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
>> index ceaddfb..54fbe90 100644
>> --- a/drivers/media/platform/soc_camera/soc_camera_platform.c
>> +++ b/drivers/media/platform/soc_camera/soc_camera_platform.c
>> @@ -10,7 +10,6 @@
>> * published by the Free Software Foundation.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
>> index 142c2ee..8cfe33e 100644
>> --- a/drivers/media/radio/dsbr100.c
>> +++ b/drivers/media/radio/dsbr100.c
>> @@ -36,7 +36,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
>> index 6ff3508..c7d2d7a 100644
>> --- a/drivers/media/radio/radio-isa.c
>> +++ b/drivers/media/radio/radio-isa.c
>> @@ -21,7 +21,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/ioport.h>
>> #include <linux/delay.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c
>> index a85b064..f4ae0f6 100644
>> --- a/drivers/media/radio/radio-ma901.c
>> +++ b/drivers/media/radio/radio-ma901.c
>> @@ -22,7 +22,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
>> index 5236035..996125d 100644
>> --- a/drivers/media/radio/radio-maxiradio.c
>> +++ b/drivers/media/radio/radio-maxiradio.c
>> @@ -34,7 +34,6 @@
>>
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/ioport.h>
>> #include <linux/delay.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
>> index a360227..4e57439 100644
>> --- a/drivers/media/radio/radio-mr800.c
>> +++ b/drivers/media/radio/radio-mr800.c
>> @@ -56,7 +56,6 @@
>> /* kernel includes */
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/radio/radio-raremono.c b/drivers/media/radio/radio-raremono.c
>> index 7b3bdbb..b27b4d5 100644
>> --- a/drivers/media/radio/radio-raremono.c
>> +++ b/drivers/media/radio/radio-raremono.c
>> @@ -17,7 +17,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> #include <linux/usb.h>
>> diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
>> index 050b3bb..c824eb3 100644
>> --- a/drivers/media/radio/radio-shark.c
>> +++ b/drivers/media/radio/radio-shark.c
>> @@ -25,7 +25,6 @@
>> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
>> index 8654e0d..5318fe3 100644
>> --- a/drivers/media/radio/radio-shark2.c
>> +++ b/drivers/media/radio/radio-shark2.c
>> @@ -25,7 +25,6 @@
>> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
>> index 3ed1f56..e491990 100644
>> --- a/drivers/media/radio/radio-tea5764.c
>> +++ b/drivers/media/radio/radio-tea5764.c
>> @@ -34,7 +34,6 @@
>> #include <linux/kernel.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> -#include <linux/init.h> /* Initdata */
>> #include <linux/videodev2.h> /* kernel radio structs */
>> #include <linux/i2c.h> /* I2C */
>> #include <media/v4l2-common.h>
>> diff --git a/drivers/media/radio/radio-tea5777.c b/drivers/media/radio/radio-tea5777.c
>> index e245597..18aae8e 100644
>> --- a/drivers/media/radio/radio-tea5777.c
>> +++ b/drivers/media/radio/radio-tea5777.c
>> @@ -24,7 +24,6 @@
>> */
>>
>> #include <linux/delay.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/sched.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
>> index ec805b0..4f1ce57 100644
>> --- a/drivers/media/radio/saa7706h.c
>> +++ b/drivers/media/radio/saa7706h.c
>> @@ -17,7 +17,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
>> index 4b76604..20c3849 100644
>> --- a/drivers/media/radio/si470x/radio-si470x.h
>> +++ b/drivers/media/radio/si470x/radio-si470x.h
>> @@ -28,7 +28,6 @@
>> /* kernel includes */
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/sched.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
>> index ba4cfc9..139ff48 100644
>> --- a/drivers/media/radio/si4713/radio-platform-si4713.c
>> +++ b/drivers/media/radio/si4713/radio-platform-si4713.c
>> @@ -23,7 +23,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/i2c.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/radio/si4713/radio-usb-si4713.c b/drivers/media/radio/si4713/radio-usb-si4713.c
>> index f1e640d..03df453 100644
>> --- a/drivers/media/radio/si4713/radio-usb-si4713.c
>> +++ b/drivers/media/radio/si4713/radio-usb-si4713.c
>> @@ -20,7 +20,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/usb.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/input.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
>> index a9319a2..e62cad6 100644
>> --- a/drivers/media/radio/tef6862.c
>> +++ b/drivers/media/radio/tef6862.c
>> @@ -17,7 +17,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> #include <linux/interrupt.h>
>> diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
>> index 4d6a63f..fecbed4 100644
>> --- a/drivers/media/rc/ati_remote.c
>> +++ b/drivers/media/rc/ati_remote.c
>> @@ -88,7 +88,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
>> index 80c611c..d8481d8 100644
>> --- a/drivers/media/rc/gpio-ir-recv.c
>> +++ b/drivers/media/rc/gpio-ir-recv.c
>> @@ -11,7 +11,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/interrupt.h>
>> #include <linux/gpio.h>
>> diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
>> index 822b9f4..639d346 100644
>> --- a/drivers/media/rc/imon.c
>> +++ b/drivers/media/rc/imon.c
>> @@ -29,7 +29,6 @@
>> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
>>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/tuners/mt2063.c b/drivers/media/tuners/mt2063.c
>> index 20cca40..b48fc4c 100644
>> --- a/drivers/media/tuners/mt2063.c
>> +++ b/drivers/media/tuners/mt2063.c
>> @@ -19,7 +19,6 @@
>> * GNU General Public License for more details.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> diff --git a/drivers/media/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c
>> index b473b76..1ebf69c 100644
>> --- a/drivers/media/tuners/mxl5005s.c
>> +++ b/drivers/media/tuners/mxl5005s.c
>> @@ -58,7 +58,6 @@
>> respective owners.
>> */
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
>> index 9823248..97afd7b 100644
>> --- a/drivers/media/tuners/tda9887.c
>> +++ b/drivers/media/tuners/tda9887.c
>> @@ -2,7 +2,6 @@
>> #include <linux/kernel.h>
>> #include <linux/i2c.h>
>> #include <linux/types.h>
>> -#include <linux/init.h>
>> #include <linux/errno.h>
>> #include <linux/delay.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c
>> index 19fe049..5428825 100644
>> --- a/drivers/media/usb/au0828/au0828-dvb.c
>> +++ b/drivers/media/usb/au0828/au0828-dvb.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/suspend.h>
>> #include <media/v4l2-common.h>
>> diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
>> index 17ec365..ae18b7b 100644
>> --- a/drivers/media/usb/au0828/au0828-i2c.c
>> +++ b/drivers/media/usb/au0828/au0828-i2c.c
>> @@ -21,7 +21,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>> #include <linux/io.h>
>>
>> diff --git a/drivers/media/usb/au0828/au0828-vbi.c b/drivers/media/usb/au0828/au0828-vbi.c
>> index 63f5930..4373d3c 100644
>> --- a/drivers/media/usb/au0828/au0828-vbi.c
>> +++ b/drivers/media/usb/au0828/au0828-vbi.c
>> @@ -23,7 +23,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>>
>> #include "au0828.h"
>> diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
>> index f615454..0bb104e 100644
>> --- a/drivers/media/usb/au0828/au0828-video.c
>> +++ b/drivers/media/usb/au0828/au0828-video.c
>> @@ -30,7 +30,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/suspend.h>
>> #include <media/v4l2-common.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
>> index 2f63029..e16a00b 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-417.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-417.c
>> @@ -26,7 +26,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> -#include <linux/init.h>
>> #include <linux/fs.h>
>> #include <linux/delay.h>
>> #include <linux/device.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
>> index 89de00b..43db655 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
>> @@ -22,7 +22,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
>> index 2ee03e4..4da2cf3 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
>> @@ -20,7 +20,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
>> index 4ba3ce0..9040a24 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-core.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
>> @@ -20,7 +20,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
>> index b3c6190..88206a0 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
>> +++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
>> @@ -22,7 +22,6 @@
>> #ifndef _PCB_CONFIG_H_
>> #define _PCB_CONFIG_H_
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>>
>> /***************************************************************************
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
>> index c027942..d95aa4f 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
>> @@ -19,7 +19,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
>> index 9906261..d91d3e1 100644
>> --- a/drivers/media/usb/cx231xx/cx231xx-video.c
>> +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
>> @@ -22,7 +22,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/usb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
>> index d56f927..4467e37 100644
>> --- a/drivers/media/usb/dvb-usb/friio-fe.c
>> +++ b/drivers/media/usb/dvb-usb/friio-fe.c
>> @@ -10,7 +10,6 @@
>> *
>> * see Documentation/dvb/README.dvb-usb for more information
>> */
>> -#include <linux/init.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>>
>> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
>> index 6efb902..fc68d17 100644
>> --- a/drivers/media/usb/em28xx/em28xx-cards.c
>> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
>> @@ -23,7 +23,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
>> index b6dc332..382bf19 100644
>> --- a/drivers/media/usb/em28xx/em28xx-core.c
>> +++ b/drivers/media/usb/em28xx/em28xx-core.c
>> @@ -22,7 +22,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/jiffies.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
>> index db3d655..0cc4759 100644
>> --- a/drivers/media/usb/em28xx/em28xx-vbi.c
>> +++ b/drivers/media/usb/em28xx/em28xx-vbi.c
>> @@ -24,7 +24,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/hardirq.h>
>> -#include <linux/init.h>
>>
>> #include "em28xx.h"
>> #include "em28xx-v4l.h"
>> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
>> index a1dcceb..3d7f909 100644
>> --- a/drivers/media/usb/em28xx/em28xx-video.c
>> +++ b/drivers/media/usb/em28xx/em28xx-video.c
>> @@ -26,7 +26,6 @@
>> Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/usb/hdpvr/hdpvr-control.c b/drivers/media/usb/hdpvr/hdpvr-control.c
>> index 6053661..d0f0791 100644
>> --- a/drivers/media/usb/hdpvr/hdpvr-control.c
>> +++ b/drivers/media/usb/hdpvr/hdpvr-control.c
>> @@ -11,7 +11,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> #include <linux/usb.h>
>> diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
>> index 2f0c89c..04e471e 100644
>> --- a/drivers/media/usb/hdpvr/hdpvr-core.c
>> +++ b/drivers/media/usb/hdpvr/hdpvr-core.c
>> @@ -13,7 +13,6 @@
>>
>> #include <linux/kernel.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> #include <linux/uaccess.h>
>> diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
>> index 0500c417..736aba4 100644
>> --- a/drivers/media/usb/hdpvr/hdpvr-video.c
>> +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
>> @@ -12,7 +12,6 @@
>> #include <linux/kernel.h>
>> #include <linux/kconfig.h>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/module.h>
>> #include <linux/uaccess.h>
>> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
>> index abf365a..b045645 100644
>> --- a/drivers/media/usb/pwc/pwc-if.c
>> +++ b/drivers/media/usb/pwc/pwc-if.c
>> @@ -58,7 +58,6 @@
>> */
>>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/mm.h>
>> #include <linux/module.h>
>> #include <linux/poll.h>
>> diff --git a/drivers/media/usb/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c
>> index aa7449e..6fcbac8 100644
>> --- a/drivers/media/usb/pwc/pwc-v4l.c
>> +++ b/drivers/media/usb/pwc/pwc-v4l.c
>> @@ -27,7 +27,6 @@
>> */
>>
>> #include <linux/errno.h>
>> -#include <linux/init.h>
>> #include <linux/mm.h>
>> #include <linux/module.h>
>> #include <linux/poll.h>
>> diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
>> index 05bd91a..84303a9 100644
>> --- a/drivers/media/usb/siano/smsusb.c
>> +++ b/drivers/media/usb/siano/smsusb.c
>> @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
>> ****************************************************************/
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/usb.h>
>> #include <linux/firmware.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
>> index 34a26e0..99b2f30 100644
>> --- a/drivers/media/usb/stk1160/stk1160-core.c
>> +++ b/drivers/media/usb/stk1160/stk1160-core.c
>> @@ -26,7 +26,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/errno.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
>> index be77482..18bc392 100644
>> --- a/drivers/media/usb/stkwebcam/stk-webcam.c
>> +++ b/drivers/media/usb/stkwebcam/stk-webcam.c
>> @@ -23,7 +23,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/errno.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/usb/tlg2300/pd-alsa.c b/drivers/media/usb/tlg2300/pd-alsa.c
>> index 3f3e141..e0f51e1 100644
>> --- a/drivers/media/usb/tlg2300/pd-alsa.c
>> +++ b/drivers/media/usb/tlg2300/pd-alsa.c
>> @@ -1,6 +1,5 @@
>> #include <linux/kernel.h>
>> #include <linux/usb.h>
>> -#include <linux/init.h>
>> #include <linux/sound.h>
>> #include <linux/spinlock.h>
>> #include <linux/soundcard.h>
>> diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
>> index ea6070b..13a57c2 100644
>> --- a/drivers/media/usb/tlg2300/pd-radio.c
>> +++ b/drivers/media/usb/tlg2300/pd-radio.c
>> @@ -1,4 +1,3 @@
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
>> index 1ccaadd..88baf37 100644
>> --- a/drivers/media/usb/tm6000/tm6000-cards.c
>> +++ b/drivers/media/usb/tm6000/tm6000-cards.c
>> @@ -17,7 +17,6 @@
>> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>> #include <linux/delay.h>
>> diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c
>> index 8a6bbf1..926ba06 100644
>> --- a/drivers/media/usb/tm6000/tm6000-input.c
>> +++ b/drivers/media/usb/tm6000/tm6000-input.c
>> @@ -18,7 +18,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/delay.h>
>>
>> #include <linux/input.h>
>> diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
>> index cc1aa14..ec88656 100644
>> --- a/drivers/media/usb/tm6000/tm6000-video.c
>> +++ b/drivers/media/usb/tm6000/tm6000-video.c
>> @@ -28,7 +28,6 @@
>> #include <linux/slab.h>
>> #include <linux/mm.h>
>> #include <linux/ioport.h>
>> -#include <linux/init.h>
>> #include <linux/sched.h>
>> #include <linux/random.h>
>> #include <linux/usb.h>
>> diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
>> index f8a60c1..aa643df 100644
>> --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
>> +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
>> @@ -9,7 +9,6 @@
>> * published by the Free Software Foundation; either version 2 of
>> * the License, or (at your option) any later version.
>> */
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/wait.h>
>> #include <linux/fs.h>
>> diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
>> index 29724af..94c5051 100644
>> --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
>> +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
>> @@ -29,7 +29,6 @@
>> #include <linux/interrupt.h>
>> #include <linux/firmware.h>
>> #include <linux/crc32.h>
>> -#include <linux/init.h>
>> #include <linux/input.h>
>>
>> #include <linux/mutex.h>
>> diff --git a/drivers/media/usb/usbtv/usbtv.c b/drivers/media/usb/usbtv/usbtv.c
>> index 6222a4a..80262e1 100644
>> --- a/drivers/media/usb/usbtv/usbtv.c
>> +++ b/drivers/media/usb/usbtv/usbtv.c
>> @@ -28,7 +28,6 @@
>> * GNU General Public License ("GPL").
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
>> index 816b1cf..191dd2b 100644
>> --- a/drivers/media/usb/usbvision/usbvision-core.c
>> +++ b/drivers/media/usb/usbvision/usbvision-core.c
>> @@ -31,7 +31,6 @@
>> #include <linux/highmem.h>
>> #include <linux/vmalloc.h>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/spinlock.h>
>> #include <linux/io.h>
>> #include <linux/videodev2.h>
>> diff --git a/drivers/media/usb/usbvision/usbvision-i2c.c b/drivers/media/usb/usbvision/usbvision-i2c.c
>> index ba262a3..ae1a1e6 100644
>> --- a/drivers/media/usb/usbvision/usbvision-i2c.c
>> +++ b/drivers/media/usb/usbvision/usbvision-i2c.c
>> @@ -27,7 +27,6 @@
>> #include <linux/kernel.h>
>> #include <linux/module.h>
>> #include <linux/delay.h>
>> -#include <linux/init.h>
>> #include <linux/uaccess.h>
>> #include <linux/ioport.h>
>> #include <linux/errno.h>
>> diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
>> index 74d56df..764c655e 100644
>> --- a/drivers/media/usb/zr364xx/zr364xx.c
>> +++ b/drivers/media/usb/zr364xx/zr364xx.c
>> @@ -29,7 +29,6 @@
>>
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/usb.h>
>> #include <linux/vmalloc.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
>> index 20c0922..f9f6d71 100644
>> --- a/drivers/media/v4l2-core/tuner-core.c
>> +++ b/drivers/media/v4l2-core/tuner-core.c
>> @@ -24,7 +24,6 @@
>> #include <linux/poll.h>
>> #include <linux/i2c.h>
>> #include <linux/types.h>
>> -#include <linux/init.h>
>> #include <linux/videodev2.h>
>> #include <media/tuner.h>
>> #include <media/tuner-types.h>
>> diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
>> index fb5ee5d..b837626 100644
>> --- a/drivers/media/v4l2-core/videobuf-core.c
>> +++ b/drivers/media/v4l2-core/videobuf-core.c
>> @@ -13,7 +13,6 @@
>> * the Free Software Foundation; either version 2
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> #include <linux/mm.h>
>> diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c
>> index 65411ad..557d42e 100644
>> --- a/drivers/media/v4l2-core/videobuf-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf-dma-contig.c
>> @@ -14,7 +14,6 @@
>> * the Free Software Foundation; either version 2
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/mm.h>
>> #include <linux/pagemap.h>
>> diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
>> index 9db674c..20c4849 100644
>> --- a/drivers/media/v4l2-core/videobuf-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
>> @@ -18,7 +18,6 @@
>> * the Free Software Foundation; either version 2
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> #include <linux/sched.h>
>> diff --git a/drivers/media/v4l2-core/videobuf-dvb.c b/drivers/media/v4l2-core/videobuf-dvb.c
>> index b7efa45..210a7cb 100644
>> --- a/drivers/media/v4l2-core/videobuf-dvb.c
>> +++ b/drivers/media/v4l2-core/videobuf-dvb.c
>> @@ -14,7 +14,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/device.h>
>> #include <linux/fs.h>
>> #include <linux/kthread.h>
>> diff --git a/drivers/media/v4l2-core/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
>> index 1365c65..8c524fd 100644
>> --- a/drivers/media/v4l2-core/videobuf-vmalloc.c
>> +++ b/drivers/media/v4l2-core/videobuf-vmalloc.c
>> @@ -13,7 +13,6 @@
>> * the Free Software Foundation; either version 2
>> */
>>
>> -#include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/moduleparam.h>
>> #include <linux/slab.h>
>
>
On Wed, Feb 5, 2014 at 4:00 PM, Paul Gortmaker
<[email protected]> wrote:
> On 14-02-05 08:02 AM, Linus Walleij wrote:
>> So I can add these patches to my devel branches now I think?
>
> The patches that weren't taken by maintainers before 3.14-rc1 were
> encompassed in the cleanup pull request to Linus sent yesterday.
Sweet! Thanks Paul.
Yours,
Linus Walleij
On Tue, Jan 21, 2014 at 1:22 PM, Paul Gortmaker
<[email protected]> wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
I will take this patch. Thanks,
-Bryan
> Cc: Bryan Wu <[email protected]>
> Cc: Richard Purdie <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/leds/led-triggers.c | 1 -
> drivers/leds/leds-88pm860x.c | 1 -
> drivers/leds/leds-adp5520.c | 1 -
> drivers/leds/leds-asic3.c | 1 -
> drivers/leds/leds-blinkm.c | 1 -
> drivers/leds/leds-cobalt-qube.c | 1 -
> drivers/leds/leds-da903x.c | 1 -
> drivers/leds/leds-da9052.c | 1 -
> drivers/leds/leds-fsg.c | 1 -
> drivers/leds/leds-gpio.c | 1 -
> drivers/leds/leds-hp6xx.c | 1 -
> drivers/leds/leds-lm3533.c | 1 -
> drivers/leds/leds-lp5521.c | 1 -
> drivers/leds/leds-lp5523.c | 1 -
> drivers/leds/leds-lp5562.c | 1 -
> drivers/leds/leds-lt3593.c | 1 -
> drivers/leds/leds-mc13783.c | 1 -
> drivers/leds/leds-netxbig.c | 1 -
> drivers/leds/leds-ns2.c | 1 -
> drivers/leds/leds-ot200.c | 1 -
> drivers/leds/leds-pwm.c | 1 -
> drivers/leds/leds-s3c24xx.c | 1 -
> drivers/leds/leds-wm831x-status.c | 1 -
> drivers/leds/leds-wm8350.c | 1 -
> 24 files changed, 24 deletions(-)
>
> diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
> index e387f41..df1a7c1 100644
> --- a/drivers/leds/led-triggers.c
> +++ b/drivers/leds/led-triggers.c
> @@ -13,7 +13,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/list.h>
> #include <linux/spinlock.h>
> #include <linux/device.h>
> diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
> index 5f588c0..d1e1bca 100644
> --- a/drivers/leds/leds-88pm860x.c
> +++ b/drivers/leds/leds-88pm860x.c
> @@ -11,7 +11,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/i2c.h>
> diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
> index 7e311a1..86b5bdb 100644
> --- a/drivers/leds/leds-adp5520.c
> +++ b/drivers/leds/leds-adp5520.c
> @@ -15,7 +15,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
> index 6de216a..70c74a7 100644
> --- a/drivers/leds/leds-asic3.c
> +++ b/drivers/leds/leds-asic3.c
> @@ -7,7 +7,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/slab.h>
> diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
> index 66d0a57..0c50860 100644
> --- a/drivers/leds/leds-blinkm.c
> +++ b/drivers/leds/leds-blinkm.c
> @@ -18,7 +18,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/jiffies.h>
> #include <linux/i2c.h>
> diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
> index 8abcb66..910339d 100644
> --- a/drivers/leds/leds-cobalt-qube.c
> +++ b/drivers/leds/leds-cobalt-qube.c
> @@ -3,7 +3,6 @@
> *
> * Control the Cobalt Qube/RaQ front LED
> */
> -#include <linux/init.h>
> #include <linux/io.h>
> #include <linux/ioport.h>
> #include <linux/leds.h>
> diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
> index 2a4b87f..35dffb1 100644
> --- a/drivers/leds/leds-da903x.c
> +++ b/drivers/leds/leds-da903x.c
> @@ -14,7 +14,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
> index 865d4fa..01486ad 100644
> --- a/drivers/leds/leds-da9052.c
> +++ b/drivers/leds/leds-da9052.c
> @@ -14,7 +14,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
> index b4d5a44..2b4dc73 100644
> --- a/drivers/leds/leds-fsg.c
> +++ b/drivers/leds/leds-fsg.c
> @@ -16,7 +16,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index 78b0e27..3f65a08 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -11,7 +11,6 @@
> *
> */
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/gpio.h>
> #include <linux/leds.h>
> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
> index 366b605..d61a988 100644
> --- a/drivers/leds/leds-hp6xx.c
> +++ b/drivers/leds/leds-hp6xx.c
> @@ -12,7 +12,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <asm/hd64461.h>
> diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
> index 027ede7..e2c642c11 100644
> --- a/drivers/leds/leds-lm3533.c
> +++ b/drivers/leds/leds-lm3533.c
> @@ -12,7 +12,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/leds.h>
> #include <linux/mfd/core.h>
> #include <linux/mutex.h>
> diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
> index 2ec34cf..8ca197a 100644
> --- a/drivers/leds/leds-lp5521.c
> +++ b/drivers/leds/leds-lp5521.c
> @@ -25,7 +25,6 @@
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
> index 4ade66a..cb5ed82 100644
> --- a/drivers/leds/leds-lp5523.c
> +++ b/drivers/leds/leds-lp5523.c
> @@ -25,7 +25,6 @@
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
> index bf006f4..315d3ca 100644
> --- a/drivers/leds/leds-lp5562.c
> +++ b/drivers/leds/leds-lp5562.c
> @@ -13,7 +13,6 @@
> #include <linux/delay.h>
> #include <linux/firmware.h>
> #include <linux/i2c.h>
> -#include <linux/init.h>
> #include <linux/leds.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
> index 3417e5b..059f5b1 100644
> --- a/drivers/leds/leds-lt3593.c
> +++ b/drivers/leds/leds-lt3593.c
> @@ -17,7 +17,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
> index ca87a1b..dca34c7 100644
> --- a/drivers/leds/leds-mc13783.c
> +++ b/drivers/leds/leds-mc13783.c
> @@ -17,7 +17,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
> index 2f9f141..e97f443 100644
> --- a/drivers/leds/leds-netxbig.c
> +++ b/drivers/leds/leds-netxbig.c
> @@ -21,7 +21,6 @@
> */
>
> #include <linux/module.h>
> -#include <linux/init.h>
> #include <linux/irq.h>
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
> index c7a4230..efa6258 100644
> --- a/drivers/leds/leds-ns2.c
> +++ b/drivers/leds/leds-ns2.c
> @@ -23,7 +23,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/gpio.h>
> diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
> index 98cae52..c9d9060 100644
> --- a/drivers/leds/leds-ot200.c
> +++ b/drivers/leds/leds-ot200.c
> @@ -8,7 +8,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/leds.h>
> diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
> index 6050474..dd17873 100644
> --- a/drivers/leds/leds-pwm.c
> +++ b/drivers/leds/leds-pwm.c
> @@ -14,7 +14,6 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/of_platform.h>
> #include <linux/fb.h>
> diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
> index 98174e7..28988b7 100644
> --- a/drivers/leds/leds-s3c24xx.c
> +++ b/drivers/leds/leds-s3c24xx.c
> @@ -12,7 +12,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/gpio.h>
> diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
> index 0a1a13f..e72c974 100644
> --- a/drivers/leds/leds-wm831x-status.c
> +++ b/drivers/leds/leds-wm831x-status.c
> @@ -10,7 +10,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/leds.h>
> diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
> index 3f75fd2..4133ffe 100644
> --- a/drivers/leds/leds-wm8350.c
> +++ b/drivers/leds/leds-wm8350.c
> @@ -10,7 +10,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/platform_device.h>
> #include <linux/leds.h>
> #include <linux/err.h>
> --
> 1.8.4.1
>
On 14-02-06 02:28 PM, Bryan Wu wrote:
> On Tue, Jan 21, 2014 at 1:22 PM, Paul Gortmaker
> <[email protected]> wrote:
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>
> I will take this patch. Thanks,
> -Bryan
The patches that weren't taken by maintainers before 3.14-rc1 were
encompassed in the cleanup pull request to Linus sent Tuesday.
http://www.spinics.net/lists/arm-kernel/msg304864.html
So, assuming he does pull it, you'll not have to do anything.
Thanks,
Paul.
--
>
>> Cc: Bryan Wu <[email protected]>
>> Cc: Richard Purdie <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>> drivers/leds/led-triggers.c | 1 -
>> drivers/leds/leds-88pm860x.c | 1 -
>> drivers/leds/leds-adp5520.c | 1 -
>> drivers/leds/leds-asic3.c | 1 -
>> drivers/leds/leds-blinkm.c | 1 -
>> drivers/leds/leds-cobalt-qube.c | 1 -
>> drivers/leds/leds-da903x.c | 1 -
>> drivers/leds/leds-da9052.c | 1 -
>> drivers/leds/leds-fsg.c | 1 -
>> drivers/leds/leds-gpio.c | 1 -
>> drivers/leds/leds-hp6xx.c | 1 -
>> drivers/leds/leds-lm3533.c | 1 -
>> drivers/leds/leds-lp5521.c | 1 -
>> drivers/leds/leds-lp5523.c | 1 -
>> drivers/leds/leds-lp5562.c | 1 -
>> drivers/leds/leds-lt3593.c | 1 -
>> drivers/leds/leds-mc13783.c | 1 -
>> drivers/leds/leds-netxbig.c | 1 -
>> drivers/leds/leds-ns2.c | 1 -
>> drivers/leds/leds-ot200.c | 1 -
>> drivers/leds/leds-pwm.c | 1 -
>> drivers/leds/leds-s3c24xx.c | 1 -
>> drivers/leds/leds-wm831x-status.c | 1 -
>> drivers/leds/leds-wm8350.c | 1 -
>> 24 files changed, 24 deletions(-)
>>
>> diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
>> index e387f41..df1a7c1 100644
>> --- a/drivers/leds/led-triggers.c
>> +++ b/drivers/leds/led-triggers.c
>> @@ -13,7 +13,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/list.h>
>> #include <linux/spinlock.h>
>> #include <linux/device.h>
>> diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
>> index 5f588c0..d1e1bca 100644
>> --- a/drivers/leds/leds-88pm860x.c
>> +++ b/drivers/leds/leds-88pm860x.c
>> @@ -11,7 +11,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/of.h>
>> #include <linux/platform_device.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
>> index 7e311a1..86b5bdb 100644
>> --- a/drivers/leds/leds-adp5520.c
>> +++ b/drivers/leds/leds-adp5520.c
>> @@ -15,7 +15,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/workqueue.h>
>> diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
>> index 6de216a..70c74a7 100644
>> --- a/drivers/leds/leds-asic3.c
>> +++ b/drivers/leds/leds-asic3.c
>> @@ -7,7 +7,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/slab.h>
>> diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
>> index 66d0a57..0c50860 100644
>> --- a/drivers/leds/leds-blinkm.c
>> +++ b/drivers/leds/leds-blinkm.c
>> @@ -18,7 +18,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/slab.h>
>> #include <linux/jiffies.h>
>> #include <linux/i2c.h>
>> diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
>> index 8abcb66..910339d 100644
>> --- a/drivers/leds/leds-cobalt-qube.c
>> +++ b/drivers/leds/leds-cobalt-qube.c
>> @@ -3,7 +3,6 @@
>> *
>> * Control the Cobalt Qube/RaQ front LED
>> */
>> -#include <linux/init.h>
>> #include <linux/io.h>
>> #include <linux/ioport.h>
>> #include <linux/leds.h>
>> diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
>> index 2a4b87f..35dffb1 100644
>> --- a/drivers/leds/leds-da903x.c
>> +++ b/drivers/leds/leds-da903x.c
>> @@ -14,7 +14,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/workqueue.h>
>> diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
>> index 865d4fa..01486ad 100644
>> --- a/drivers/leds/leds-da9052.c
>> +++ b/drivers/leds/leds-da9052.c
>> @@ -14,7 +14,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/workqueue.h>
>> diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
>> index b4d5a44..2b4dc73 100644
>> --- a/drivers/leds/leds-fsg.c
>> +++ b/drivers/leds/leds-fsg.c
>> @@ -16,7 +16,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
>> index 78b0e27..3f65a08 100644
>> --- a/drivers/leds/leds-gpio.c
>> +++ b/drivers/leds/leds-gpio.c
>> @@ -11,7 +11,6 @@
>> *
>> */
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/gpio.h>
>> #include <linux/leds.h>
>> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
>> index 366b605..d61a988 100644
>> --- a/drivers/leds/leds-hp6xx.c
>> +++ b/drivers/leds/leds-hp6xx.c
>> @@ -12,7 +12,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <asm/hd64461.h>
>> diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
>> index 027ede7..e2c642c11 100644
>> --- a/drivers/leds/leds-lm3533.c
>> +++ b/drivers/leds/leds-lm3533.c
>> @@ -12,7 +12,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/leds.h>
>> #include <linux/mfd/core.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
>> index 2ec34cf..8ca197a 100644
>> --- a/drivers/leds/leds-lp5521.c
>> +++ b/drivers/leds/leds-lp5521.c
>> @@ -25,7 +25,6 @@
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
>> index 4ade66a..cb5ed82 100644
>> --- a/drivers/leds/leds-lp5523.c
>> +++ b/drivers/leds/leds-lp5523.c
>> @@ -25,7 +25,6 @@
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
>> index bf006f4..315d3ca 100644
>> --- a/drivers/leds/leds-lp5562.c
>> +++ b/drivers/leds/leds-lp5562.c
>> @@ -13,7 +13,6 @@
>> #include <linux/delay.h>
>> #include <linux/firmware.h>
>> #include <linux/i2c.h>
>> -#include <linux/init.h>
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
>> index 3417e5b..059f5b1 100644
>> --- a/drivers/leds/leds-lt3593.c
>> +++ b/drivers/leds/leds-lt3593.c
>> @@ -17,7 +17,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/workqueue.h>
>> diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
>> index ca87a1b..dca34c7 100644
>> --- a/drivers/leds/leds-mc13783.c
>> +++ b/drivers/leds/leds-mc13783.c
>> @@ -17,7 +17,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/workqueue.h>
>> diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
>> index 2f9f141..e97f443 100644
>> --- a/drivers/leds/leds-netxbig.c
>> +++ b/drivers/leds/leds-netxbig.c
>> @@ -21,7 +21,6 @@
>> */
>>
>> #include <linux/module.h>
>> -#include <linux/init.h>
>> #include <linux/irq.h>
>> #include <linux/slab.h>
>> #include <linux/spinlock.h>
>> diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
>> index c7a4230..efa6258 100644
>> --- a/drivers/leds/leds-ns2.c
>> +++ b/drivers/leds/leds-ns2.c
>> @@ -23,7 +23,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/slab.h>
>> #include <linux/gpio.h>
>> diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
>> index 98cae52..c9d9060 100644
>> --- a/drivers/leds/leds-ot200.c
>> +++ b/drivers/leds/leds-ot200.c
>> @@ -8,7 +8,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/slab.h>
>> #include <linux/leds.h>
>> diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
>> index 6050474..dd17873 100644
>> --- a/drivers/leds/leds-pwm.c
>> +++ b/drivers/leds/leds-pwm.c
>> @@ -14,7 +14,6 @@
>>
>> #include <linux/module.h>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/of_platform.h>
>> #include <linux/fb.h>
>> diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
>> index 98174e7..28988b7 100644
>> --- a/drivers/leds/leds-s3c24xx.c
>> +++ b/drivers/leds/leds-s3c24xx.c
>> @@ -12,7 +12,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/gpio.h>
>> diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
>> index 0a1a13f..e72c974 100644
>> --- a/drivers/leds/leds-wm831x-status.c
>> +++ b/drivers/leds/leds-wm831x-status.c
>> @@ -10,7 +10,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/slab.h>
>> #include <linux/leds.h>
>> diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
>> index 3f75fd2..4133ffe 100644
>> --- a/drivers/leds/leds-wm8350.c
>> +++ b/drivers/leds/leds-wm8350.c
>> @@ -10,7 +10,6 @@
>> */
>>
>> #include <linux/kernel.h>
>> -#include <linux/init.h>
>> #include <linux/platform_device.h>
>> #include <linux/leds.h>
>> #include <linux/err.h>
>> --
>> 1.8.4.1
>>
On Thu, Feb 6, 2014 at 11:40 AM, Paul Gortmaker
<[email protected]> wrote:
> On 14-02-06 02:28 PM, Bryan Wu wrote:
>> On Tue, Jan 21, 2014 at 1:22 PM, Paul Gortmaker
>> <[email protected]> wrote:
>>> None of these files are actually using any __init type directives
>>> and hence don't need to include <linux/init.h>. Most are just a
>>> left over from __devinit and __cpuinit removal, or simply due to
>>> code getting copied from one driver to the next.
>>>
>>
>> I will take this patch. Thanks,
>> -Bryan
>
> The patches that weren't taken by maintainers before 3.14-rc1 were
> encompassed in the cleanup pull request to Linus sent Tuesday.
>
> http://www.spinics.net/lists/arm-kernel/msg304864.html
>
> So, assuming he does pull it, you'll not have to do anything.
>
Sure, I will wait Linus pull and rebase my tree, then everything should be fine.
Thanks,
-Bryan
> --
>
>>
>>> Cc: Bryan Wu <[email protected]>
>>> Cc: Richard Purdie <[email protected]>
>>> Cc: [email protected]
>>> Signed-off-by: Paul Gortmaker <[email protected]>
>>> ---
>>> drivers/leds/led-triggers.c | 1 -
>>> drivers/leds/leds-88pm860x.c | 1 -
>>> drivers/leds/leds-adp5520.c | 1 -
>>> drivers/leds/leds-asic3.c | 1 -
>>> drivers/leds/leds-blinkm.c | 1 -
>>> drivers/leds/leds-cobalt-qube.c | 1 -
>>> drivers/leds/leds-da903x.c | 1 -
>>> drivers/leds/leds-da9052.c | 1 -
>>> drivers/leds/leds-fsg.c | 1 -
>>> drivers/leds/leds-gpio.c | 1 -
>>> drivers/leds/leds-hp6xx.c | 1 -
>>> drivers/leds/leds-lm3533.c | 1 -
>>> drivers/leds/leds-lp5521.c | 1 -
>>> drivers/leds/leds-lp5523.c | 1 -
>>> drivers/leds/leds-lp5562.c | 1 -
>>> drivers/leds/leds-lt3593.c | 1 -
>>> drivers/leds/leds-mc13783.c | 1 -
>>> drivers/leds/leds-netxbig.c | 1 -
>>> drivers/leds/leds-ns2.c | 1 -
>>> drivers/leds/leds-ot200.c | 1 -
>>> drivers/leds/leds-pwm.c | 1 -
>>> drivers/leds/leds-s3c24xx.c | 1 -
>>> drivers/leds/leds-wm831x-status.c | 1 -
>>> drivers/leds/leds-wm8350.c | 1 -
>>> 24 files changed, 24 deletions(-)
>>>
>>> diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
>>> index e387f41..df1a7c1 100644
>>> --- a/drivers/leds/led-triggers.c
>>> +++ b/drivers/leds/led-triggers.c
>>> @@ -13,7 +13,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/list.h>
>>> #include <linux/spinlock.h>
>>> #include <linux/device.h>
>>> diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
>>> index 5f588c0..d1e1bca 100644
>>> --- a/drivers/leds/leds-88pm860x.c
>>> +++ b/drivers/leds/leds-88pm860x.c
>>> @@ -11,7 +11,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/of.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/i2c.h>
>>> diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
>>> index 7e311a1..86b5bdb 100644
>>> --- a/drivers/leds/leds-adp5520.c
>>> +++ b/drivers/leds/leds-adp5520.c
>>> @@ -15,7 +15,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/workqueue.h>
>>> diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
>>> index 6de216a..70c74a7 100644
>>> --- a/drivers/leds/leds-asic3.c
>>> +++ b/drivers/leds/leds-asic3.c
>>> @@ -7,7 +7,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/slab.h>
>>> diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
>>> index 66d0a57..0c50860 100644
>>> --- a/drivers/leds/leds-blinkm.c
>>> +++ b/drivers/leds/leds-blinkm.c
>>> @@ -18,7 +18,6 @@
>>> */
>>>
>>> #include <linux/module.h>
>>> -#include <linux/init.h>
>>> #include <linux/slab.h>
>>> #include <linux/jiffies.h>
>>> #include <linux/i2c.h>
>>> diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
>>> index 8abcb66..910339d 100644
>>> --- a/drivers/leds/leds-cobalt-qube.c
>>> +++ b/drivers/leds/leds-cobalt-qube.c
>>> @@ -3,7 +3,6 @@
>>> *
>>> * Control the Cobalt Qube/RaQ front LED
>>> */
>>> -#include <linux/init.h>
>>> #include <linux/io.h>
>>> #include <linux/ioport.h>
>>> #include <linux/leds.h>
>>> diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
>>> index 2a4b87f..35dffb1 100644
>>> --- a/drivers/leds/leds-da903x.c
>>> +++ b/drivers/leds/leds-da903x.c
>>> @@ -14,7 +14,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/workqueue.h>
>>> diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
>>> index 865d4fa..01486ad 100644
>>> --- a/drivers/leds/leds-da9052.c
>>> +++ b/drivers/leds/leds-da9052.c
>>> @@ -14,7 +14,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/workqueue.h>
>>> diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
>>> index b4d5a44..2b4dc73 100644
>>> --- a/drivers/leds/leds-fsg.c
>>> +++ b/drivers/leds/leds-fsg.c
>>> @@ -16,7 +16,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/module.h>
>>> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
>>> index 78b0e27..3f65a08 100644
>>> --- a/drivers/leds/leds-gpio.c
>>> +++ b/drivers/leds/leds-gpio.c
>>> @@ -11,7 +11,6 @@
>>> *
>>> */
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/gpio.h>
>>> #include <linux/leds.h>
>>> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
>>> index 366b605..d61a988 100644
>>> --- a/drivers/leds/leds-hp6xx.c
>>> +++ b/drivers/leds/leds-hp6xx.c
>>> @@ -12,7 +12,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <asm/hd64461.h>
>>> diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
>>> index 027ede7..e2c642c11 100644
>>> --- a/drivers/leds/leds-lm3533.c
>>> +++ b/drivers/leds/leds-lm3533.c
>>> @@ -12,7 +12,6 @@
>>> */
>>>
>>> #include <linux/module.h>
>>> -#include <linux/init.h>
>>> #include <linux/leds.h>
>>> #include <linux/mfd/core.h>
>>> #include <linux/mutex.h>
>>> diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
>>> index 2ec34cf..8ca197a 100644
>>> --- a/drivers/leds/leds-lp5521.c
>>> +++ b/drivers/leds/leds-lp5521.c
>>> @@ -25,7 +25,6 @@
>>> #include <linux/delay.h>
>>> #include <linux/firmware.h>
>>> #include <linux/i2c.h>
>>> -#include <linux/init.h>
>>> #include <linux/leds.h>
>>> #include <linux/module.h>
>>> #include <linux/mutex.h>
>>> diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
>>> index 4ade66a..cb5ed82 100644
>>> --- a/drivers/leds/leds-lp5523.c
>>> +++ b/drivers/leds/leds-lp5523.c
>>> @@ -25,7 +25,6 @@
>>> #include <linux/delay.h>
>>> #include <linux/firmware.h>
>>> #include <linux/i2c.h>
>>> -#include <linux/init.h>
>>> #include <linux/leds.h>
>>> #include <linux/module.h>
>>> #include <linux/mutex.h>
>>> diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
>>> index bf006f4..315d3ca 100644
>>> --- a/drivers/leds/leds-lp5562.c
>>> +++ b/drivers/leds/leds-lp5562.c
>>> @@ -13,7 +13,6 @@
>>> #include <linux/delay.h>
>>> #include <linux/firmware.h>
>>> #include <linux/i2c.h>
>>> -#include <linux/init.h>
>>> #include <linux/leds.h>
>>> #include <linux/module.h>
>>> #include <linux/mutex.h>
>>> diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
>>> index 3417e5b..059f5b1 100644
>>> --- a/drivers/leds/leds-lt3593.c
>>> +++ b/drivers/leds/leds-lt3593.c
>>> @@ -17,7 +17,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/workqueue.h>
>>> diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
>>> index ca87a1b..dca34c7 100644
>>> --- a/drivers/leds/leds-mc13783.c
>>> +++ b/drivers/leds/leds-mc13783.c
>>> @@ -17,7 +17,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/workqueue.h>
>>> diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
>>> index 2f9f141..e97f443 100644
>>> --- a/drivers/leds/leds-netxbig.c
>>> +++ b/drivers/leds/leds-netxbig.c
>>> @@ -21,7 +21,6 @@
>>> */
>>>
>>> #include <linux/module.h>
>>> -#include <linux/init.h>
>>> #include <linux/irq.h>
>>> #include <linux/slab.h>
>>> #include <linux/spinlock.h>
>>> diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
>>> index c7a4230..efa6258 100644
>>> --- a/drivers/leds/leds-ns2.c
>>> +++ b/drivers/leds/leds-ns2.c
>>> @@ -23,7 +23,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/slab.h>
>>> #include <linux/gpio.h>
>>> diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
>>> index 98cae52..c9d9060 100644
>>> --- a/drivers/leds/leds-ot200.c
>>> +++ b/drivers/leds/leds-ot200.c
>>> @@ -8,7 +8,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/slab.h>
>>> #include <linux/leds.h>
>>> diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
>>> index 6050474..dd17873 100644
>>> --- a/drivers/leds/leds-pwm.c
>>> +++ b/drivers/leds/leds-pwm.c
>>> @@ -14,7 +14,6 @@
>>>
>>> #include <linux/module.h>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/of_platform.h>
>>> #include <linux/fb.h>
>>> diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
>>> index 98174e7..28988b7 100644
>>> --- a/drivers/leds/leds-s3c24xx.c
>>> +++ b/drivers/leds/leds-s3c24xx.c
>>> @@ -12,7 +12,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/gpio.h>
>>> diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
>>> index 0a1a13f..e72c974 100644
>>> --- a/drivers/leds/leds-wm831x-status.c
>>> +++ b/drivers/leds/leds-wm831x-status.c
>>> @@ -10,7 +10,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/slab.h>
>>> #include <linux/leds.h>
>>> diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
>>> index 3f75fd2..4133ffe 100644
>>> --- a/drivers/leds/leds-wm8350.c
>>> +++ b/drivers/leds/leds-wm8350.c
>>> @@ -10,7 +10,6 @@
>>> */
>>>
>>> #include <linux/kernel.h>
>>> -#include <linux/init.h>
>>> #include <linux/platform_device.h>
>>> #include <linux/leds.h>
>>> #include <linux/err.h>
>>> --
>>> 1.8.4.1
>>>
On Tue, Jan 21, 2014 at 04:23:15PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> This covers off all the remaining scattered instances in drivers
> in order to avoid a bunch more separate smaller commits.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
On Tue, Jan 21, 2014 at 04:22:04PM -0500, Paul Gortmaker wrote:
> The __cpuinit support was removed several releases ago. People
> have had a chance to update their out of tree code, so now we
> remove the no-op stubs.
>
> Also delete the mention of __cpuinitdata from the tag script.
>
> Cc: Andrew Morton <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Samuel Ortiz <[email protected]>
> Cc: Lee Jones <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, Jan 21, 2014 at 04:22:51PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Tejun Heo <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Applied to libata/for-3.15.
Thanks.
--
tejun
On 01/23/14 22:16, Charles Keepax wrote:
> On Tue, Jan 21, 2014 at 04:22:22PM -0500, Paul Gortmaker wrote:
>> Despite the name mach-crag6410-module.c, the code is built for
>> MACH_WLF_CRAGG_6410 -- which is bool, and hence this code is
>> either present or absent. It will never be modular, so using
>> module_init as an alias for __initcall can be somewhat
>> misleading.
>>
>> Fix this up now, so that we can relocate module_init from
>> init.h into module.h in the future. If we don't do this, we'd
>> have to add module.h to obviously non-modular code, and that
>> would be a worse thing.
>>
>> Note that direct use of __initcall is discouraged, vs. one
>> of the priority categorized subgroups. As __initcall gets
>> mapped onto device_initcall, our use of device_initcall
>> directly in this change means that the runtime impact is
>> zero -- it will remain at level 6 in initcall ordering.
>>
>> Cc: Ben Dooks<[email protected]>
>> Cc: Kukjin Kim<[email protected]>
>> Cc: Russell King<[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker<[email protected]>
>> ---
>
> Tested-by: Charles Keepax<[email protected]>
>
Thanks, applied.
- Kukjin
Hi Paul,
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Wim Van Sebroeck <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> drivers/watchdog/ar7_wdt.c | 1 -
> drivers/watchdog/ath79_wdt.c | 1 -
> drivers/watchdog/bcm47xx_wdt.c | 1 -
> drivers/watchdog/bcm63xx_wdt.c | 1 -
> drivers/watchdog/cpu5wdt.c | 1 -
> drivers/watchdog/cpwd.c | 1 -
> drivers/watchdog/davinci_wdt.c | 1 -
> drivers/watchdog/hpwdt.c | 1 -
> drivers/watchdog/i6300esb.c | 1 -
> drivers/watchdog/jz4740_wdt.c | 1 -
> drivers/watchdog/max63xx_wdt.c | 1 -
> drivers/watchdog/mtx-1_wdt.c | 1 -
> drivers/watchdog/nuc900_wdt.c | 1 -
> drivers/watchdog/of_xilinx_wdt.c | 1 -
> drivers/watchdog/omap_wdt.c | 1 -
> drivers/watchdog/orion_wdt.c | 1 -
> drivers/watchdog/pnx4008_wdt.c | 1 -
> drivers/watchdog/rdc321x_wdt.c | 1 -
> drivers/watchdog/retu_wdt.c | 1 -
> drivers/watchdog/riowd.c | 1 -
> drivers/watchdog/s3c2410_wdt.c | 1 -
> drivers/watchdog/sp805_wdt.c | 1 -
> drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 -
> drivers/watchdog/wdt_pci.c | 1 -
> 24 files changed, 24 deletions(-)
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
On Tue, Jan 21, 2014 at 04:23:12PM -0500, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
I applied this to my "pci/pending" branch. After v3.15-rc1, I will sort
this into something for inclusion in -next.
Sorry for the delay; I don't remember why I didn't pick this up before.
Bjorn
> ---
> drivers/pci/bus.c | 1 -
> drivers/pci/host-bridge.c | 1 -
> drivers/pci/hotplug/acpiphp_glue.c | 1 -
> drivers/pci/hotplug/cpqphp_nvram.c | 1 -
> drivers/pci/hotplug/s390_pci_hpc.c | 1 -
> drivers/pci/msi.c | 1 -
> drivers/pci/search.c | 1 -
> drivers/pci/setup-irq.c | 1 -
> drivers/pci/setup-res.c | 1 -
> 9 files changed, 9 deletions(-)
>
> diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
> index 00660cc..ad0f20a 100644
> --- a/drivers/pci/bus.c
> +++ b/drivers/pci/bus.c
> @@ -13,7 +13,6 @@
> #include <linux/errno.h>
> #include <linux/ioport.h>
> #include <linux/proc_fs.h>
> -#include <linux/init.h>
> #include <linux/slab.h>
>
> #include "pci.h"
> diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
> index 06ace62..389e3df 100644
> --- a/drivers/pci/host-bridge.c
> +++ b/drivers/pci/host-bridge.c
> @@ -3,7 +3,6 @@
> */
>
> #include <linux/kernel.h>
> -#include <linux/init.h>
> #include <linux/pci.h>
> #include <linux/module.h>
>
> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
> index cd929ae..1629963 100644
> --- a/drivers/pci/hotplug/acpiphp_glue.c
> +++ b/drivers/pci/hotplug/acpiphp_glue.c
> @@ -41,7 +41,6 @@
>
> #define pr_fmt(fmt) "acpiphp_glue: " fmt
>
> -#include <linux/init.h>
> #include <linux/module.h>
>
> #include <linux/kernel.h>
> diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
> index 76ba8a1..9600a39 100644
> --- a/drivers/pci/hotplug/cpqphp_nvram.c
> +++ b/drivers/pci/hotplug/cpqphp_nvram.c
> @@ -34,7 +34,6 @@
> #include <linux/workqueue.h>
> #include <linux/pci.h>
> #include <linux/pci_hotplug.h>
> -#include <linux/init.h>
> #include <asm/uaccess.h>
> #include "cpqphp.h"
> #include "cpqphp_nvram.h"
> diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
> index 8d2ce22..d1332d2 100644
> --- a/drivers/pci/hotplug/s390_pci_hpc.c
> +++ b/drivers/pci/hotplug/s390_pci_hpc.c
> @@ -15,7 +15,6 @@
> #include <linux/slab.h>
> #include <linux/pci.h>
> #include <linux/pci_hotplug.h>
> -#include <linux/init.h>
> #include <asm/pci_debug.h>
> #include <asm/sclp.h>
>
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 7a0fec6..18ca2497 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -10,7 +10,6 @@
> #include <linux/mm.h>
> #include <linux/irq.h>
> #include <linux/interrupt.h>
> -#include <linux/init.h>
> #include <linux/export.h>
> #include <linux/ioport.h>
> #include <linux/pci.h>
> diff --git a/drivers/pci/search.c b/drivers/pci/search.c
> index 3ff2ac7..cc6db38 100644
> --- a/drivers/pci/search.c
> +++ b/drivers/pci/search.c
> @@ -7,7 +7,6 @@
> * Copyright (C) 2003 -- 2004 Greg Kroah-Hartman <[email protected]>
> */
>
> -#include <linux/init.h>
> #include <linux/pci.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
> index 9bd6864..dbc4ffc 100644
> --- a/drivers/pci/setup-irq.c
> +++ b/drivers/pci/setup-irq.c
> @@ -10,7 +10,6 @@
> */
>
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/pci.h>
> #include <linux/errno.h>
> diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
> index 5c060b1..3e5682c 100644
> --- a/drivers/pci/setup-res.c
> +++ b/drivers/pci/setup-res.c
> @@ -16,7 +16,6 @@
> * Resource sorting
> */
>
> -#include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/export.h>
> #include <linux/pci.h>
> --
> 1.8.4.1
>
On 21/01/2014 at 16:22:45 -0500, Paul Gortmaker wrote :
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Cc: Alessandro Zummo <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
I've contemplated applying that patch but I'm not sure it is actually a
good idea because those 46 drivers are using a variant of module_driver
which actually uses __init and __exit. After your patch it is still
working simply because init.h gets included that way:
linux/module.h:9
linux/list.h:8
linux/kernel.h:13
linux/printk.h:5
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
[Re: [42/73] rtc: delete non-required instances of include <linux/init.h>] On 08/06/2015 (Mon 21:54) Alexandre Belloni wrote:
> On 21/01/2014 at 16:22:45 -0500, Paul Gortmaker wrote :
> > None of these files are actually using any __init type directives
> > and hence don't need to include <linux/init.h>. Most are just a
> > left over from __devinit and __cpuinit removal, or simply due to
> > code getting copied from one driver to the next.
> >
> > Cc: Alessandro Zummo <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Paul Gortmaker <[email protected]>
>
> I've contemplated applying that patch but I'm not sure it is actually a
> good idea because those 46 drivers are using a variant of module_driver
> which actually uses __init and __exit. After your patch it is still
> working simply because init.h gets included that way:
Firstly, I am kind of curious why an 18 month old patch is getting
replied to now. That aside, this interdependence between module.h and
init.h was reconsidered and you can see the resolution solution here:
https://lkml.kernel.org/r/[email protected]
To summarize what is said there, yes - you can ignore the one line
removals for now. We will revisit them after the above is merged.
Thanks,
Paul.
--
>
> linux/module.h:9
> linux/list.h:8
> linux/kernel.h:13
> linux/printk.h:5
>
> --
> Alexandre Belloni, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
On 08/06/2015 at 17:06:34 -0400, Paul Gortmaker wrote :
> > I've contemplated applying that patch but I'm not sure it is actually a
> > good idea because those 46 drivers are using a variant of module_driver
> > which actually uses __init and __exit. After your patch it is still
> > working simply because init.h gets included that way:
>
> Firstly, I am kind of curious why an 18 month old patch is getting
> replied to now. That aside, this interdependence between module.h and
> init.h was reconsidered and you can see the resolution solution here:
>
> https://lkml.kernel.org/r/[email protected]
>
> To summarize what is said there, yes - you can ignore the one line
> removals for now. We will revisit them after the above is merged.
>
I've taken the RTC subsystem maintainership and I've been sorting the
2372 patches left in patchwork down to 126 and yours was one of these.
Seeing your answer, I think my question was legitimate. I'll be happy to
take your revised patch once ready.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
On Tue, Jun 9, 2015 at 3:49 AM, Alexandre Belloni
<[email protected]> wrote:
> On 08/06/2015 at 17:06:34 -0400, Paul Gortmaker wrote :
>> > I've contemplated applying that patch but I'm not sure it is actually a
>> > good idea because those 46 drivers are using a variant of module_driver
>> > which actually uses __init and __exit. After your patch it is still
>> > working simply because init.h gets included that way:
>>
>> Firstly, I am kind of curious why an 18 month old patch is getting
>> replied to now. That aside, this interdependence between module.h and
>> init.h was reconsidered and you can see the resolution solution here:
>>
>> https://lkml.kernel.org/r/[email protected]
>>
>> To summarize what is said there, yes - you can ignore the one line
>> removals for now. We will revisit them after the above is merged.
>>
>
> I've taken the RTC subsystem maintainership and I've been sorting the
> 2372 patches left in patchwork down to 126 and yours was one of these.
>
> Seeing your answer, I think my question was legitimate. I'll be happy to
> take your revised patch once ready.
Yes, it was a legit (and correct) spotting ; just some months late. :)
I'll be sure to make sure you are CC'd on any updates. And thanks
for taking over maintainership of the rtc subsystem. I'll go out on
a limb here and guess that the original rtc driver author ; that idiot
never imagined it would become a subsystem, else he'd thank you
as well.
Paul.
--
>
> --
> Alexandre Belloni, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arch" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html