[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <046f909122e03286faf0a8916f30d56259656e14.1585852001.git.alexander.riesen@cetitec.com>
Date: Thu, 2 Apr 2020 20:34:03 +0200
From: Alex Riesen <alexander.riesen@...itec.com>
To: Kieran Bingham <kieran.bingham@...asonboard.com>
CC: Geert Uytterhoeven <geert@...ux-m68k.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Hans Verkuil <hverkuil-cisco@...all.nl>,
"Laurent Pinchart" <laurent.pinchart@...asonboard.com>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
<devel@...verdev.osuosl.org>, <linux-media@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <devicetree@...r.kernel.org>,
<linux-renesas-soc@...r.kernel.org>
Subject: [PATCH v5 2/9] media: adv748x: include everything adv748x.h needs
into the file
To follow the established practice of not depending on others to
pull everything in. While at it, make sure it stays like this.
Signed-off-by: Alexander Riesen <alexander.riesen@...itec.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
---
drivers/media/i2c/adv748x/adv748x-afe.c | 6 ++----
drivers/media/i2c/adv748x/adv748x-core.c | 6 ++----
drivers/media/i2c/adv748x/adv748x-csi2.c | 6 ++----
drivers/media/i2c/adv748x/adv748x-hdmi.c | 6 ++----
drivers/media/i2c/adv748x/adv748x.h | 2 ++
5 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
index dbbb1e4d6363..5a25d1fbe25f 100644
--- a/drivers/media/i2c/adv748x/adv748x-afe.c
+++ b/drivers/media/i2c/adv748x/adv748x-afe.c
@@ -6,18 +6,16 @@
* Copyright (C) 2017 Renesas Electronics Corp.
*/
+#include "adv748x.h"
+
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/v4l2-dv-timings.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-dv-timings.h>
#include <media/v4l2-ioctl.h>
-#include "adv748x.h"
-
/* -----------------------------------------------------------------------------
* SDP
*/
diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index c3fb113cef62..5c59aad319d1 100644
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -10,6 +10,8 @@
* Kieran Bingham <kieran.bingham@...asonboard.com>
*/
+#include "adv748x.h"
+
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/i2c.h>
@@ -20,14 +22,10 @@
#include <linux/slab.h>
#include <linux/v4l2-dv-timings.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-dv-timings.h>
#include <media/v4l2-fwnode.h>
#include <media/v4l2-ioctl.h>
-#include "adv748x.h"
-
/* -----------------------------------------------------------------------------
* Register manipulation
*/
diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
index c43ce5d78723..c00d4f347d95 100644
--- a/drivers/media/i2c/adv748x/adv748x-csi2.c
+++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
@@ -5,15 +5,13 @@
* Copyright (C) 2017 Renesas Electronics Corp.
*/
+#include "adv748x.h"
+
#include <linux/module.h>
#include <linux/mutex.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
-#include "adv748x.h"
-
static int adv748x_csi2_set_virtual_channel(struct adv748x_csi2 *tx,
unsigned int vc)
{
diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/adv748x/adv748x-hdmi.c
index c557f8fdf11a..f598acec3b5c 100644
--- a/drivers/media/i2c/adv748x/adv748x-hdmi.c
+++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c
@@ -5,18 +5,16 @@
* Copyright (C) 2017 Renesas Electronics Corp.
*/
+#include "adv748x.h"
+
#include <linux/module.h>
#include <linux/mutex.h>
-#include <media/v4l2-ctrls.h>
-#include <media/v4l2-device.h>
#include <media/v4l2-dv-timings.h>
#include <media/v4l2-ioctl.h>
#include <uapi/linux/v4l2-dv-timings.h>
-#include "adv748x.h"
-
/* -----------------------------------------------------------------------------
* HDMI and CP
*/
diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
index fccb388ce179..09aab4138c3f 100644
--- a/drivers/media/i2c/adv748x/adv748x.h
+++ b/drivers/media/i2c/adv748x/adv748x.h
@@ -19,6 +19,8 @@
*/
#include <linux/i2c.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
#ifndef _ADV748X_H_
#define _ADV748X_H_
--
2.25.1.25.g9ecbe7eb18
Powered by blists - more mailing lists