diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-03-22 07:39:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-04-16 17:24:15 -0400 |
commit | 3bdaa382b294946a6b8661c3eb77e595940c8a61 (patch) | |
tree | 47c2f60fd4553b6b327128d39af1c5dc801af3e3 /include/media | |
parent | 3d7543b9196cb0de8e65750f1da9ad155c22e12f (diff) |
[media] media: davinci: vpfe: use v4l2_fh for priority handling
This patch migrates the vpfe driver to use v4l2_fh for
priority handling.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/davinci/vpfe_capture.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h index cc973ed845a7..288772e6900a 100644 --- a/include/media/davinci/vpfe_capture.h +++ b/include/media/davinci/vpfe_capture.h | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/videodev2.h> | 26 | #include <linux/videodev2.h> |
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <media/v4l2-fh.h> | ||
29 | #include <media/v4l2-ioctl.h> | 30 | #include <media/v4l2-ioctl.h> |
30 | #include <media/v4l2-device.h> | 31 | #include <media/v4l2-device.h> |
31 | #include <media/videobuf-dma-contig.h> | 32 | #include <media/videobuf-dma-contig.h> |
@@ -110,8 +111,6 @@ struct vpfe_device { | |||
110 | struct v4l2_device v4l2_dev; | 111 | struct v4l2_device v4l2_dev; |
111 | /* parent device */ | 112 | /* parent device */ |
112 | struct device *pdev; | 113 | struct device *pdev; |
113 | /* Used to keep track of state of the priority */ | ||
114 | struct v4l2_prio_state prio; | ||
115 | /* number of open instances of the channel */ | 114 | /* number of open instances of the channel */ |
116 | u32 usrs; | 115 | u32 usrs; |
117 | /* Indicates id of the field which is being displayed */ | 116 | /* Indicates id of the field which is being displayed */ |
@@ -174,11 +173,10 @@ struct vpfe_device { | |||
174 | 173 | ||
175 | /* File handle structure */ | 174 | /* File handle structure */ |
176 | struct vpfe_fh { | 175 | struct vpfe_fh { |
176 | struct v4l2_fh fh; | ||
177 | struct vpfe_device *vpfe_dev; | 177 | struct vpfe_device *vpfe_dev; |
178 | /* Indicates whether this file handle is doing IO */ | 178 | /* Indicates whether this file handle is doing IO */ |
179 | u8 io_allowed; | 179 | u8 io_allowed; |
180 | /* Used to keep track priority of this instance */ | ||
181 | enum v4l2_priority prio; | ||
182 | }; | 180 | }; |
183 | 181 | ||
184 | struct vpfe_config_params { | 182 | struct vpfe_config_params { |