summaryrefslogtreecommitdiff
path: root/include/media/drv-intf
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2023-03-01 12:21:38 +0000
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-04-15 08:50:36 +0100
commitacdb15732869a429081b347d2ec40a425ea0b47f (patch)
tree6bd19dd1d59541e10c0a35c3d3610234d18e5352 /include/media/drv-intf
parent999a9fbf0724e5f04720f334d099c8c6ec903508 (diff)
media: saa7146: drop 'dev' and 'resources' from struct saa7146_fh
Instead use vv->resources and video_drvdata(file) to obtain this information. This prepares for the vb2 conversion later when saa7146_fh is dropped completely. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'include/media/drv-intf')
-rw-r--r--include/media/drv-intf/saa7146_vv.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/media/drv-intf/saa7146_vv.h b/include/media/drv-intf/saa7146_vv.h
index 932961e8f5ab..fee861670ddb 100644
--- a/include/media/drv-intf/saa7146_vv.h
+++ b/include/media/drv-intf/saa7146_vv.h
@@ -80,15 +80,12 @@ struct saa7146_dmaqueue {
struct saa7146_fh {
/* Must be the first field! */
struct v4l2_fh fh;
- struct saa7146_dev *dev;
/* video capture */
struct videobuf_queue video_q;
/* vbi capture */
struct videobuf_queue vbi_q;
-
- unsigned int resources; /* resource management for device open */
};
#define STATUS_CAPTURE 0x02
@@ -192,8 +189,8 @@ int saa7146_s_ctrl(struct v4l2_ctrl *ctrl);
extern const struct saa7146_use_ops saa7146_vbi_uops;
/* resource management functions */
-int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit);
-void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits);
+int saa7146_res_get(struct saa7146_dev *dev, unsigned int bit);
+void saa7146_res_free(struct saa7146_dev *dev, unsigned int bits);
#define RESOURCE_DMA1_HPS 0x1
#define RESOURCE_DMA2_CLP 0x2