diff options
| author | Paul Kocialkowski <paul.kocialkowski@bootlin.com> | 2022-08-26 20:32:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-24 11:21:45 +0200 |
| commit | ab2e8d5d67fb86ff74ccb3cad9b57988fb1adfcd (patch) | |
| tree | 85fa42a6e774e082513076250670dda755598b1a /drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h | |
| parent | cad7f35c1ab50bad92479e64ae57628b61da8b1b (diff) | |
| download | lwn-ab2e8d5d67fb86ff74ccb3cad9b57988fb1adfcd.tar.gz lwn-ab2e8d5d67fb86ff74ccb3cad9b57988fb1adfcd.zip | |
media: sun6i-csi: Tidy up video code
Some code cleanups, renames, variable lowerings and moving things around for
better organization. No functional change intended.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: Maxime Ripard <maxime@cerno.tech>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h')
| -rw-r--r-- | drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h index 30e37ee0d07f..7864f062d05b 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h @@ -15,22 +15,22 @@ struct sun6i_csi_device; struct sun6i_video { struct sun6i_csi_device *csi_dev; - struct video_device vdev; - struct media_pad pad; - struct mutex lock; + struct video_device video_dev; + struct vb2_queue queue; + struct mutex lock; /* Queue lock. */ + struct media_pad pad; - struct vb2_queue vb2_vidq; - spinlock_t dma_queue_lock; struct list_head dma_queue; + spinlock_t dma_queue_lock; /* DMA queue lock. */ - unsigned int sequence; - struct v4l2_format fmt; + struct v4l2_format format; u32 mbus_code; + unsigned int sequence; }; -int sun6i_video_init(struct sun6i_video *video, - struct sun6i_csi_device *csi_dev, const char *name); +int sun6i_video_setup(struct sun6i_video *video, + struct sun6i_csi_device *csi_dev); void sun6i_video_cleanup(struct sun6i_video *video); void sun6i_video_frame_done(struct sun6i_video *video); |