From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH 7/8] v4l: Improve header file ordering
Date: Mon, 13 Feb 2017 15:28:15 +0200 [thread overview]
Message-ID: <1486992496-21078-8-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1486992496-21078-1-git-send-email-sakari.ailus@linux.intel.com>
Improve header file ordering and remove a few duplicates and unnecessary
headers for drivers the header file ordering of which was adversely
affected by V4L2 OF to V4L2 fwnode API changes.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/adv7604.c | 4 ++--
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 ++--
drivers/media/i2c/s5k5baf.c | 2 +-
drivers/media/i2c/tc358743.c | 2 +-
drivers/media/i2c/tvp514x.c | 10 +++++-----
drivers/media/platform/atmel/atmel-isc.c | 2 +-
drivers/media/platform/exynos4-is/media-dev.c | 4 ++--
drivers/media/platform/pxa_camera.c | 2 +-
drivers/media/platform/soc_camera/atmel-isi.c | 2 +-
drivers/media/platform/ti-vpe/cal.c | 7 ++-----
10 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 9281e54..f821da5 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -40,12 +40,12 @@
#include <linux/workqueue.h>
#include <linux/regmap.h>
-#include <media/i2c/adv7604.h>
#include <media/cec.h>
+#include <media/i2c/adv7604.h>
#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
#include <media/v4l2-dv-timings.h>
+#include <media/v4l2-device.h>
#include <media/v4l2-fwnode.h>
static int debug;
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index f434fb2..aa2f034 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -30,13 +30,13 @@
#include <linux/slab.h>
#include <linux/spi/spi.h>
#include <linux/videodev2.h>
+#include <media/i2c/s5c73m3.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-mediabus.h>
-#include <media/i2c/s5c73m3.h>
-#include <media/v4l2-fwnode.h>
#include "s5c73m3.h"
diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index 962051b..5eafc05 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -28,9 +28,9 @@
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-mediabus.h>
-#include <media/v4l2-fwnode.h>
static int debug;
module_param(debug, int, 0644);
diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
index 6a1b428..87c84c1 100644
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -38,12 +38,12 @@
#include <linux/workqueue.h>
#include <linux/v4l2-dv-timings.h>
#include <linux/hdmi.h>
+#include <media/i2c/tc358743.h>
#include <media/v4l2-dv-timings.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h>
#include <media/v4l2-fwnode.h>
-#include <media/i2c/tc358743.h>
#include "tc358743_regs.h"
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index ad2df99..92ac4ad 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -34,14 +34,14 @@
#include <linux/of.h>
#include <linux/of_graph.h>
+#include <media/i2c/tvp514x.h>
+#include <media/media-entity.h>
#include <media/v4l2-async.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-common.h>
-#include <media/v4l2-mediabus.h>
-#include <media/v4l2-fwnode.h>
#include <media/v4l2-ctrls.h>
-#include <media/i2c/tvp514x.h>
-#include <media/media-entity.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
+#include <media/v4l2-mediabus.h>
#include "tvp514x_regs.h"
diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
index 7af92e7..db97445 100644
--- a/drivers/media/platform/atmel/atmel-isc.c
+++ b/drivers/media/platform/atmel/atmel-isc.c
@@ -38,9 +38,9 @@
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#include <media/v4l2-image-sizes.h>
#include <media/v4l2-ioctl.h>
-#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
#include <media/videobuf2-dma-contig.h>
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index 4a1808c..50bbd98 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -27,11 +27,11 @@
#include <linux/pm_runtime.h>
#include <linux/types.h>
#include <linux/slab.h>
+#include <media/drv-intf/exynos-fimc.h>
+#include <media/media-device.h>
#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-fwnode.h>
-#include <media/media-device.h>
-#include <media/drv-intf/exynos-fimc.h>
#include "media-dev.h"
#include "fimc-core.h"
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index 1ad4cf9..69b06c6 100644
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -39,8 +39,8 @@
#include <media/v4l2-clk.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
-#include <media/v4l2-ioctl.h>
#include <media/v4l2-fwnode.h>
+#include <media/v4l2-ioctl.h>
#include <media/videobuf2-dma-sg.h>
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index f9f2ad6..2640468 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -24,8 +24,8 @@
#include <linux/pm_runtime.h>
#include <linux/slab.h>
-#include <media/soc_camera.h>
#include <media/drv-intf/soc_mediabus.h>
+#include <media/soc_camera.h>
#include <media/v4l2-fwnode.h>
#include <media/videobuf2-dma-contig.h>
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index f72f541..5870f1e 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -21,17 +21,14 @@
#include <linux/of_device.h>
#include <linux/of_graph.h>
-#include <media/v4l2-fwnode.h>
#include <media/v4l2-async.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-ctrls.h>
#include <media/v4l2-fh.h>
-#include <media/v4l2-event.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-fwnode.h>
+#include <media/v4l2-ioctl.h>
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
#include "cal_regs.h"
--
2.7.4
next prev parent reply other threads:[~2017-02-13 13:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-13 13:28 [PATCH 0/8] V4L2 fwnode support Sakari Ailus
2017-02-13 13:28 ` [PATCH 1/8] v4l: flash led class: Use fwnode_handle instead of device_node in init Sakari Ailus
2017-02-13 13:56 ` kbuild test robot
2017-02-13 14:02 ` kbuild test robot
2017-02-13 13:28 ` [PATCH 2/8] v4l: fwnode: Support generic fwnode for parsing standardised properties Sakari Ailus
2017-02-13 13:28 ` [PATCH 3/8] v4l: async: Add fwnode match support Sakari Ailus
[not found] ` <1486992496-21078-1-git-send-email-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-13 13:28 ` [PATCH 4/8] v4l2-async: Provide interoperability between OF and fwnode matching Sakari Ailus
2017-02-13 14:22 ` kbuild test robot
2017-02-13 13:28 ` [PATCH 5/8] v4l: Switch from V4L2 OF not V4L2 fwnode API Sakari Ailus
[not found] ` <1486992496-21078-6-git-send-email-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-13 14:05 ` kbuild test robot
2017-02-13 14:18 ` kbuild test robot
2017-02-13 16:57 ` Benoit Parrot
2017-02-14 7:06 ` Sakari Ailus
2017-02-14 7:07 ` [PATCH v1.1 " Sakari Ailus
2017-02-14 7:12 ` Sakari Ailus
2017-02-15 14:46 ` Benoit Parrot
2017-02-13 13:28 ` [PATCH 6/8] v4l: media/drv-intf/soc_mediabus.h: include dependent header file Sakari Ailus
2017-02-13 13:28 ` Sakari Ailus [this message]
2017-02-13 13:28 ` [PATCH 8/8] v4l: Remove V4L2 OF framework in favour of V4L2 fwnode framework Sakari Ailus
2017-03-09 11:25 ` [PATCH 8/9] docs-rst: media: Switch documentation to V4L2 fwnode API Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1486992496-21078-8-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).