diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-01-30 11:46:54 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-16 10:38:24 -0400 |
commit | 313162d0b83836e2f57e51b9b8650fb4b9c396ea (patch) | |
tree | 8f39f20515a924d392cf9a72db0918fda07a34c7 /include/trace | |
parent | 51990e825431089747f8896244b5c17d3a6423f1 (diff) |
device.h: audit and cleanup users in main include dir
The <linux/device.h> header includes a lot of stuff, and
it in turn gets a lot of use just for the basic "struct device"
which appears so often.
Clean up the users as follows:
1) For those headers only needing "struct device" as a pointer
in fcn args, replace the include with exactly that.
2) For headers not really using anything from device.h, simply
delete the include altogether.
3) For headers relying on getting device.h implicitly before
being included themselves, now explicitly include device.h
4) For files in which doing #1 or #2 uncovers an implicit
dependency on some other header, fix by explicitly adding
the required header(s).
Any C files that were implicitly relying on device.h to be
present have already been dealt with in advance.
Total removals from #1 and #2: 51. Total additions coming
from #3: 9. Total other implicit dependencies from #4: 7.
As of 3.3-rc1, there were 110, so a net removal of 42 gives
about a 38% reduction in device.h presence in include/*
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/regmap.h | 2 | ||||
-rw-r--r-- | include/trace/events/rpm.h | 3 | ||||
-rw-r--r-- | include/trace/events/writeback.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h index 12fbf43524e9..50fe9ba61442 100644 --- a/include/trace/events/regmap.h +++ b/include/trace/events/regmap.h | |||
@@ -4,10 +4,10 @@ | |||
4 | #if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ) |
5 | #define _TRACE_REGMAP_H | 5 | #define _TRACE_REGMAP_H |
6 | 6 | ||
7 | #include <linux/device.h> | ||
8 | #include <linux/ktime.h> | 7 | #include <linux/ktime.h> |
9 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
10 | 9 | ||
10 | struct device; | ||
11 | struct regmap; | 11 | struct regmap; |
12 | 12 | ||
13 | /* | 13 | /* |
diff --git a/include/trace/events/rpm.h b/include/trace/events/rpm.h index d62c558bf64b..33f85b68c22c 100644 --- a/include/trace/events/rpm.h +++ b/include/trace/events/rpm.h | |||
@@ -7,7 +7,8 @@ | |||
7 | 7 | ||
8 | #include <linux/ktime.h> | 8 | #include <linux/ktime.h> |
9 | #include <linux/tracepoint.h> | 9 | #include <linux/tracepoint.h> |
10 | #include <linux/device.h> | 10 | |
11 | struct device; | ||
11 | 12 | ||
12 | /* | 13 | /* |
13 | * The rpm_internal events are used for tracing some important | 14 | * The rpm_internal events are used for tracing some important |
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 8588a8918023..2d0dd3e03e41 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #define _TRACE_WRITEBACK_H | 5 | #define _TRACE_WRITEBACK_H |
6 | 6 | ||
7 | #include <linux/backing-dev.h> | 7 | #include <linux/backing-dev.h> |
8 | #include <linux/device.h> | ||
9 | #include <linux/writeback.h> | 8 | #include <linux/writeback.h> |
10 | 9 | ||
11 | #define show_inode_state(state) \ | 10 | #define show_inode_state(state) \ |