[PATCH v2 29/66] media: sun6i-csi: Move csi buffer definition to main header file
Paul Kocialkowski
paul.kocialkowski at bootlin.com
Sat Feb 5 10:53:52 PST 2022
The buffer structure is a top-level definition, put it in the main header
to keep things tidy. No functional change intended.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
---
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 9 +++++++++
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index 356661b413f8..4dd83e57bafa 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -11,12 +11,21 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-fwnode.h>
+#include <media/videobuf2-v4l2.h>
#include "sun6i_video.h"
#define SUN6I_CSI_NAME "sun6i-csi"
#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device"
+struct sun6i_csi_buffer {
+ struct vb2_v4l2_buffer v4l2_buffer;
+ struct list_head list;
+
+ dma_addr_t dma_addr;
+ bool queued_to_csi;
+};
+
/**
* struct sun6i_csi_config - configs for sun6i csi
* @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
index 6f5470a6859d..d32ff6b81f8a 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
@@ -23,14 +23,6 @@
#define MAX_WIDTH (4800)
#define MAX_HEIGHT (4800)
-struct sun6i_csi_buffer {
- struct vb2_v4l2_buffer v4l2_buffer;
- struct list_head list;
-
- dma_addr_t dma_addr;
- bool queued_to_csi;
-};
-
/* Helpers */
static struct v4l2_subdev *
--
2.34.1
More information about the linux-arm-kernel
mailing list