Skip to contentSkip to conversation

sh_veu: Include media/v4l2-image-sizes.h

PATCH New Axel Lin 1 participant 2 messages Aug 9, 2014 Media (V4L/DVB)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 sh_veu: Include media/v4l2-image-sizes.h

So we can remove the same defines in the driver code.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/media/platform/sh_veu.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/platform/sh_veu.c +1 -3
index 8dc279d..be3b3bc 100644
@@ -26,6 +26,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-mem2mem.h>
+#include <media/v4l2-image-sizes.h>
 #include <media/videobuf2-dma-contig.h>
 
 #define VEU_STR 0x00 /* start register */

@@ -135,9 +136,6 @@ enum sh_veu_fmt_idx {
 	SH_VEU_FMT_RGB24,
 };
 
-#define VGA_WIDTH	640
-#define VGA_HEIGHT	480
-
 #define DEFAULT_IN_WIDTH	VGA_WIDTH
 #define DEFAULT_IN_HEIGHT	VGA_HEIGHT
 #define DEFAULT_IN_FMTIDX	SH_VEU_FMT_NV12
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 via-camera: Include media/v4l2-image-sizes.h

So we can remove the same defines in the driver code.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/media/platform/via-camera.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/media/platform/via-camera.c +1 -8
index b4f9d03..2ac8704 100644
@@ -18,6 +18,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-image-sizes.h>
 #include <media/ov7670.h>
 #include <media/videobuf-dma-sg.h>
 #include <linux/delay.h>

@@ -49,14 +50,6 @@ MODULE_PARM_DESC(override_serial,
 		"to force-enable the camera.");
 
 /*
- * Basic window sizes.
- */
-#define VGA_WIDTH	640
-#define VGA_HEIGHT	480
-#define QCIF_WIDTH	176
-#define	QCIF_HEIGHT	144
-
-/*
  * The structure describing our camera.
  */
 enum viacam_opstate { S_IDLE = 0, S_RUNNING = 1 };
Signature · 1 line
1.9.1