diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-01-22 11:23:42 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-11 14:27:37 -0400 |
commit | 51990e825431089747f8896244b5c17d3a6423f1 (patch) | |
tree | 5c1ef975ab55734a45444b629855a51f09775b93 | |
parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) |
device.h: cleanup users outside of linux/include (C files)
For files that are actively using linux/device.h, make sure
that they call it out. This will allow us to clean up some
of the implicit uses of linux/device.h within include/*
without introducing build regressions.
Yes, this was created by "cheating" -- i.e. the headers were
cleaned up, and then the fallout was found and fixed, and then
the two commits were reordered. This ensures we don't introduce
build regressions into the git history.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | drivers/base/power/clock_ops.c | 1 | ||||
-rw-r--r-- | drivers/base/power/common.c | 1 | ||||
-rw-r--r-- | drivers/base/power/opp.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regcache-lzo.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regcache.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regmap-irq.c | 1 | ||||
-rw-r--r-- | drivers/base/regmap/regmap.c | 1 | ||||
-rw-r--r-- | drivers/edac/edac_stub.c | 1 | ||||
-rw-r--r-- | drivers/edac/mce_amd_inj.c | 1 | ||||
-rw-r--r-- | drivers/mfd/wm8994-regmap.c | 1 | ||||
-rw-r--r-- | drivers/power/apm_power.c | 1 | ||||
-rw-r--r-- | drivers/power/power_supply.h | 4 | ||||
-rw-r--r-- | drivers/power/power_supply_leds.c | 1 | ||||
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 | ||||
-rw-r--r-- | net/rfkill/core.c | 1 | ||||
-rw-r--r-- | sound/core/init.c | 1 | ||||
-rw-r--r-- | sound/core/pcm.c | 1 | ||||
-rw-r--r-- | sound/core/seq/seq.c | 1 | ||||
-rw-r--r-- | sound/core/timer.c | 1 |
21 files changed, 24 insertions, 0 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index 428e55e012dc..869d7ff2227f 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c | |||
@@ -8,6 +8,7 @@ | |||
8 | 8 | ||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/device.h> | ||
11 | #include <linux/io.h> | 12 | #include <linux/io.h> |
12 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
13 | #include <linux/pm_clock.h> | 14 | #include <linux/pm_clock.h> |
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index 4af7c1cbf909..a14085cc613f 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c | |||
@@ -8,6 +8,7 @@ | |||
8 | 8 | ||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/device.h> | ||
11 | #include <linux/export.h> | 12 | #include <linux/export.h> |
12 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
13 | #include <linux/pm_clock.h> | 14 | #include <linux/pm_clock.h> |
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 95706fa24c73..ac993eafec82 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/cpufreq.h> | 19 | #include <linux/cpufreq.h> |
20 | #include <linux/device.h> | ||
20 | #include <linux/list.h> | 21 | #include <linux/list.h> |
21 | #include <linux/rculist.h> | 22 | #include <linux/rculist.h> |
22 | #include <linux/rcupdate.h> | 23 | #include <linux/rcupdate.h> |
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c index b7d16143edeb..51f6f28dadf1 100644 --- a/drivers/base/regmap/regcache-lzo.c +++ b/drivers/base/regmap/regcache-lzo.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/device.h> | ||
14 | #include <linux/lzo.h> | 15 | #include <linux/lzo.h> |
15 | 16 | ||
16 | #include "internal.h" | 17 | #include "internal.h" |
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index 32620c4f1683..b487c29a67dc 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/device.h> | ||
14 | #include <linux/debugfs.h> | 15 | #include <linux/debugfs.h> |
15 | #include <linux/rbtree.h> | 16 | #include <linux/rbtree.h> |
16 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 1ead66186b7c..214f704c34db 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/export.h> | 14 | #include <linux/export.h> |
15 | #include <linux/device.h> | ||
15 | #include <trace/events/regmap.h> | 16 | #include <trace/events/regmap.h> |
16 | #include <linux/bsearch.h> | 17 | #include <linux/bsearch.h> |
17 | #include <linux/sort.h> | 18 | #include <linux/sort.h> |
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 6f397476e27c..8c90a83ae24f 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
16 | #include <linux/debugfs.h> | 16 | #include <linux/debugfs.h> |
17 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
18 | #include <linux/device.h> | ||
18 | 19 | ||
19 | #include "internal.h" | 20 | #include "internal.h" |
20 | 21 | ||
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 428836fc5835..1befaa7a31cb 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/export.h> | 13 | #include <linux/export.h> |
14 | #include <linux/device.h> | ||
14 | #include <linux/regmap.h> | 15 | #include <linux/regmap.h> |
15 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
16 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index be10a4ff6609..87f9e1129ae9 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -10,6 +10,7 @@ | |||
10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/device.h> | ||
13 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
15 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c index 670c4481453b..6c86f6e54558 100644 --- a/drivers/edac/edac_stub.c +++ b/drivers/edac/edac_stub.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
17 | #include <linux/atomic.h> | 17 | #include <linux/atomic.h> |
18 | #include <linux/device.h> | ||
18 | #include <asm/edac.h> | 19 | #include <asm/edac.h> |
19 | 20 | ||
20 | int edac_op_state = EDAC_OPSTATE_INVAL; | 21 | int edac_op_state = EDAC_OPSTATE_INVAL; |
diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c index 885e8ad8fdcf..66b5151c1080 100644 --- a/drivers/edac/mce_amd_inj.c +++ b/drivers/edac/mce_amd_inj.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/kobject.h> | 13 | #include <linux/kobject.h> |
14 | #include <linux/device.h> | ||
14 | #include <linux/edac.h> | 15 | #include <linux/edac.h> |
15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
16 | #include <asm/mce.h> | 17 | #include <asm/mce.h> |
diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c index c598ae69b8ff..0c0a215f3fdd 100644 --- a/drivers/mfd/wm8994-regmap.c +++ b/drivers/mfd/wm8994-regmap.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/mfd/wm8994/core.h> | 15 | #include <linux/mfd/wm8994/core.h> |
16 | #include <linux/mfd/wm8994/registers.h> | 16 | #include <linux/mfd/wm8994/registers.h> |
17 | #include <linux/regmap.h> | 17 | #include <linux/regmap.h> |
18 | #include <linux/device.h> | ||
18 | 19 | ||
19 | #include "wm8994.h" | 20 | #include "wm8994.h" |
20 | 21 | ||
diff --git a/drivers/power/apm_power.c b/drivers/power/apm_power.c index 8a612dec9139..39763015b360 100644 --- a/drivers/power/apm_power.c +++ b/drivers/power/apm_power.c | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/device.h> | ||
13 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
14 | #include <linux/apm-emulation.h> | 15 | #include <linux/apm-emulation.h> |
15 | 16 | ||
diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h index 018de2b26998..cc439fd89d8d 100644 --- a/drivers/power/power_supply.h +++ b/drivers/power/power_supply.h | |||
@@ -10,6 +10,10 @@ | |||
10 | * You may use this code as per GPL version 2 | 10 | * You may use this code as per GPL version 2 |
11 | */ | 11 | */ |
12 | 12 | ||
13 | struct device; | ||
14 | struct device_type; | ||
15 | struct power_supply; | ||
16 | |||
13 | #ifdef CONFIG_SYSFS | 17 | #ifdef CONFIG_SYSFS |
14 | 18 | ||
15 | extern void power_supply_init_attrs(struct device_type *dev_type); | 19 | extern void power_supply_init_attrs(struct device_type *dev_type); |
diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c index da25eb94e5c6..995f966ed5b7 100644 --- a/drivers/power/power_supply_leds.c +++ b/drivers/power/power_supply_leds.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/device.h> | ||
14 | #include <linux/power_supply.h> | 15 | #include <linux/power_supply.h> |
15 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
16 | 17 | ||
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index b52b57ca3084..4368e7d61316 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -12,6 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
15 | #include <linux/device.h> | ||
15 | #include <linux/power_supply.h> | 16 | #include <linux/power_supply.h> |
16 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
17 | #include <linux/stat.h> | 18 | #include <linux/stat.h> |
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 354760ebbbd2..f974961754ca 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/rfkill.h> | 29 | #include <linux/rfkill.h> |
30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
32 | #include <linux/device.h> | ||
32 | #include <linux/miscdevice.h> | 33 | #include <linux/miscdevice.h> |
33 | #include <linux/wait.h> | 34 | #include <linux/wait.h> |
34 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
diff --git a/sound/core/init.c b/sound/core/init.c index 3ac49b1b7cb8..995fc5d4b1a3 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/device.h> | ||
25 | #include <linux/file.h> | 26 | #include <linux/file.h> |
26 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
27 | #include <linux/time.h> | 28 | #include <linux/time.h> |
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 8928ca871c22..1888a90bd5b6 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/time.h> | 25 | #include <linux/time.h> |
26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
27 | #include <linux/device.h> | ||
27 | #include <sound/core.h> | 28 | #include <sound/core.h> |
28 | #include <sound/minors.h> | 29 | #include <sound/minors.h> |
29 | #include <sound/pcm.h> | 30 | #include <sound/pcm.h> |
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c index 9d8379aedf40..712110561082 100644 --- a/sound/core/seq/seq.c +++ b/sound/core/seq/seq.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/device.h> | ||
24 | #include <sound/core.h> | 25 | #include <sound/core.h> |
25 | #include <sound/initval.h> | 26 | #include <sound/initval.h> |
26 | 27 | ||
diff --git a/sound/core/timer.c b/sound/core/timer.c index 8e7561dfc5fc..6ddcf06f52f9 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/time.h> | 25 | #include <linux/time.h> |
26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
27 | #include <linux/device.h> | ||
27 | #include <linux/module.h> | 28 | #include <linux/module.h> |
28 | #include <linux/string.h> | 29 | #include <linux/string.h> |
29 | #include <sound/core.h> | 30 | #include <sound/core.h> |