diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-05-31 12:47:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-12 21:04:30 -0400 |
commit | f525e176f938f31a7335ce2bfec433236e0d8d6a (patch) | |
tree | 19d2b49cd4efb9359bfebb8e2cb0db0ace40ba20 | |
parent | 0e761b21b9d6c7a95a8e2b858af85d07f6c62d99 (diff) |
[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>
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-isp.h | 13 | ||||
-rw-r--r-- | drivers/media/platform/exynos4-is/media-dev.h | 8 |
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/exynos4-is/fimc-isp.h index 800aba7ab4a7..f5c802cf40f9 100644 --- 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 { | |||
118 | unsigned int frame_count; | 118 | unsigned int frame_count; |
119 | unsigned int reqbufs_count; | 119 | unsigned int reqbufs_count; |
120 | int streaming; | 120 | int streaming; |
121 | unsigned long payload[FIMC_ISP_MAX_PLANES]; | ||
122 | const struct fimc_fmt *format; | 121 | const struct fimc_fmt *format; |
123 | }; | 122 | }; |
124 | 123 | ||
@@ -128,15 +127,9 @@ struct fimc_is_video { | |||
128 | * @alloc_ctx: videobuf2 memory allocator context | 127 | * @alloc_ctx: videobuf2 memory allocator context |
129 | * @subdev: ISP v4l2_subdev | 128 | * @subdev: ISP v4l2_subdev |
130 | * @subdev_pads: the ISP subdev media pads | 129 | * @subdev_pads: the ISP subdev media pads |
131 | * @ctrl_handler: v4l2 controls handler | ||
132 | * @test_pattern: test pattern controls | 130 | * @test_pattern: test pattern controls |
133 | * @pipeline: video capture pipeline data structure | 131 | * @ctrls: v4l2 controls structure |
134 | * @video_lock: mutex serializing video device and the subdev operations | 132 | * @video_lock: mutex serializing video device and the subdev operations |
135 | * @fmt: pointer to color format description structure | ||
136 | * @payload: image size in bytes (w x h x bpp) | ||
137 | * @inp_frame: camera input frame structure | ||
138 | * @out_frame: DMA output frame structure | ||
139 | * @source_subdev_grp_id: group id of remote source subdev | ||
140 | * @cac_margin_x: horizontal CAC margin in pixels | 133 | * @cac_margin_x: horizontal CAC margin in pixels |
141 | * @cac_margin_y: vertical CAC margin in pixels | 134 | * @cac_margin_y: vertical CAC margin in pixels |
142 | * @state: driver state flags | 135 | * @state: driver state flags |
@@ -154,10 +147,6 @@ struct fimc_isp { | |||
154 | struct mutex video_lock; | 147 | struct mutex video_lock; |
155 | struct mutex subdev_lock; | 148 | struct mutex subdev_lock; |
156 | 149 | ||
157 | struct fimc_isp_frame inp_frame; | ||
158 | struct fimc_isp_frame out_frame; | ||
159 | unsigned int source_subdev_grp_id; | ||
160 | |||
161 | unsigned int cac_margin_x; | 150 | unsigned int cac_margin_x; |
162 | unsigned int cac_margin_y; | 151 | unsigned int cac_margin_y; |
163 | 152 | ||
diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/exynos4-is/media-dev.h index a704eea2cfbd..62599fd7756f 100644 --- 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 { | |||
133 | struct list_head pipelines; | 133 | struct list_head pipelines; |
134 | }; | 134 | }; |
135 | 135 | ||
136 | #define is_subdev_pad(pad) (pad == NULL || \ | ||
137 | media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV) | ||
138 | |||
139 | #define me_subtype(me) \ | ||
140 | ((me->type) & (MEDIA_ENT_TYPE_MASK | MEDIA_ENT_SUBTYPE_MASK)) | ||
141 | |||
142 | #define subdev_has_devnode(__sd) (__sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE) | ||
143 | |||
144 | static inline | 136 | static inline |
145 | struct fimc_sensor_info *source_to_sensor_info(struct fimc_source_info *si) | 137 | struct fimc_sensor_info *source_to_sensor_info(struct fimc_source_info *si) |
146 | { | 138 | { |