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/media | |
| parent | 51990e825431089747f8896244b5c17d3a6423f1 (diff) | |
| download | op-kernel-dev-313162d0b83836e2f57e51b9b8650fb4b9c396ea.zip op-kernel-dev-313162d0b83836e2f57e51b9b8650fb4b9c396ea.tar.gz | |
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/media')
| -rw-r--r-- | include/media/media-device.h | 3 | ||||
| -rw-r--r-- | include/media/v4l2-ctrls.h | 1 | ||||
| -rw-r--r-- | include/media/v4l2-ioctl.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/media/media-device.h b/include/media/media-device.h index 6a27d91..eaade98 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -23,7 +23,6 @@ #ifndef _MEDIA_DEVICE_H #define _MEDIA_DEVICE_H -#include <linux/device.h> #include <linux/list.h> #include <linux/mutex.h> #include <linux/spinlock.h> @@ -31,6 +30,8 @@ #include <media/media-devnode.h> #include <media/media-entity.h> +struct device; + /** * struct media_device - Media device * @dev: Parent device diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index eeb3df6..62e04dd 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -22,7 +22,6 @@ #define _V4L2_CTRLS_H #include <linux/list.h> -#include <linux/device.h> #include <linux/videodev2.h> /* forward references */ diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index 3f5d60f..032ff21 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h @@ -11,7 +11,6 @@ #include <linux/poll.h> #include <linux/fs.h> -#include <linux/device.h> #include <linux/mutex.h> #include <linux/compiler.h> /* need __user */ #include <linux/videodev2.h> |
