diff options
author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2014-05-16 17:33:15 +0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-24 02:05:58 +0400 |
commit | fcc22af21764cc0196997a5531904d1b1f11011e (patch) | |
tree | 9a9e615af7f1350452593633df816d789d56bd9e /drivers/media/platform/davinci/vpif_display.h | |
parent | 4be2153cf73d73039c6946b7915e3c0fc4721676 (diff) | |
download | linux-fcc22af21764cc0196997a5531904d1b1f11011e.tar.xz |
[media] media: davinci: vpif_display: use v4l2_fh_open and vb2_fop_release
this patch adds support to use v4l2_fh_open() and vb2_fop_release,
which allows to drop driver specific struct vpif_fh, as this is handeled
by core. This patch also drops vpif_g/s_priority as this handeled
by core.
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 'drivers/media/platform/davinci/vpif_display.h')
-rw-r--r-- | drivers/media/platform/davinci/vpif_display.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h index 4d0485b99a80..18c7bd5d8c2c 100644 --- a/drivers/media/platform/davinci/vpif_display.h +++ b/drivers/media/platform/davinci/vpif_display.h @@ -113,8 +113,6 @@ struct channel_obj { /* V4l2 specific parameters */ struct video_device *video_dev; /* Identifies video device for * this channel */ - struct v4l2_prio_state prio; /* Used to keep track of state of - * the priority */ atomic_t usrs; /* number of open instances of * the channel */ u32 field_id; /* Indicates id of the field @@ -130,19 +128,6 @@ struct channel_obj { struct video_obj video; }; -/* File handle structure */ -struct vpif_fh { - struct channel_obj *channel; /* pointer to channel object for - * opened device */ - u8 io_allowed[VPIF_NUMOBJECTS]; /* Indicates whether this file handle - * is doing IO */ - enum v4l2_priority prio; /* Used to keep track priority of - * this instance */ - u8 initialized; /* Used to keep track of whether this - * file handle has initialized - * channel or not */ -}; - /* vpif device structure */ struct vpif_device { struct v4l2_device v4l2_dev; |