[media] exynos4-is: Remove unused code

Remove unused macros and fields of struct fimc_is_video.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/exynos4-is/fimc-isp.h
index 800aba7ab4a7871f8a37c51846a5ad41b28224a7..f5c802cf40f9090ecf708e18cd8cd455d091f0f4 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-isp.h
+++ b/drivers/media/platform/exynos4-is/fimc-isp.h
@@ -118,7 +118,6 @@ struct fimc_is_video {
        unsigned int            frame_count;
        unsigned int            reqbufs_count;
        int                     streaming;
-       unsigned long           payload[FIMC_ISP_MAX_PLANES];
        const struct fimc_fmt   *format;
 };
 
@@ -128,15 +127,9 @@ struct fimc_is_video {
  * @alloc_ctx: videobuf2 memory allocator context
  * @subdev: ISP v4l2_subdev
  * @subdev_pads: the ISP subdev media pads
- * @ctrl_handler: v4l2 controls handler
  * @test_pattern: test pattern controls
- * @pipeline: video capture pipeline data structure
+ * @ctrls: v4l2 controls structure
  * @video_lock: mutex serializing video device and the subdev operations
- * @fmt: pointer to color format description structure
- * @payload: image size in bytes (w x h x bpp)
- * @inp_frame: camera input frame structure
- * @out_frame: DMA output frame structure
- * @source_subdev_grp_id: group id of remote source subdev
  * @cac_margin_x: horizontal CAC margin in pixels
  * @cac_margin_y: vertical CAC margin in pixels
  * @state: driver state flags
@@ -154,10 +147,6 @@ struct fimc_isp {
        struct mutex                    video_lock;
        struct mutex                    subdev_lock;
 
-       struct fimc_isp_frame           inp_frame;
-       struct fimc_isp_frame           out_frame;
-       unsigned int                    source_subdev_grp_id;
-
        unsigned int                    cac_margin_x;
        unsigned int                    cac_margin_y;
 

diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h
index a704eea2cfbd0ef13d50c5e93dd5ffa6940e8538..62599fd7756f5ce05c4a4ba23d9beb3f70abea2b 100644 (file)
--- a/drivers/media/platform/exynos4-is/media-dev.h
+++ b/drivers/media/platform/exynos4-is/media-dev.h
@@ -133,14 +133,6 @@ struct fimc_md {
        struct list_head pipelines;
 };
 
-#define is_subdev_pad(pad) (pad == NULL || \
-       media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV)
-
-#define me_subtype(me) \
-       ((me->type) & (MEDIA_ENT_TYPE_MASK | MEDIA_ENT_SUBTYPE_MASK))
-
-#define subdev_has_devnode(__sd) (__sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE)
-
 static inline
 struct fimc_sensor_info *source_to_sensor_info(struct fimc_source_info *si)
 {