Since the bytecap video driver is now handling all
capture (byte & pixel), rename the file and structs
*into capture. This is done by:
- renaming of dcmipp-bytecap.c into dcmipp-capture.c
- replace of dcmipp_bytecap strings into dcmipp_capture
Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
---
.../media/platform/st/stm32/stm32-dcmipp/Makefile | 2 +-
.../{dcmipp-bytecap.c => dcmipp-capture.c} | 188 ++++++++++-----------
.../platform/st/stm32/stm32-dcmipp/dcmipp-common.h | 4 +-
.../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 8 +-
4 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/Makefile b/drivers/media/platform/st/stm32/stm32-dcmipp/Makefile
index 7178934bb116..e35d45a0aca2 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/Makefile
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-stm32-dcmipp-y := dcmipp-core.o dcmipp-common.o dcmipp-input.o dcmipp-byteproc.o dcmipp-bytecap.o
+stm32-dcmipp-y := dcmipp-core.o dcmipp-common.o dcmipp-input.o dcmipp-byteproc.o dcmipp-capture.o
stm32-dcmipp-y += dcmipp-pixelcommon.o dcmipp-isp.o dcmipp-pixelproc.o
obj-$(CONFIG_VIDEO_STM32_DCMIPP) += stm32-dcmipp.o
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-capture.c
similarity index 85%
rename from drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
rename to drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-capture.c
index e96ba7931b27..d9a2b7f159ea 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-capture.c
@@ -95,7 +95,7 @@
#define DCMIPP_PxPPCR_SWAPRB BIT(4)
-struct dcmipp_bytecap_pix_map {
+struct dcmipp_capture_pix_map {
unsigned int code;
u32 pixelformat;
u32 plane_nb;
@@ -109,7 +109,7 @@ struct dcmipp_bytecap_pix_map {
.pixelformat = V4L2_PIX_FMT_##fmt \
}
-static const struct dcmipp_bytecap_pix_map dcmipp_bytecap_dump_pix_map_list[] = {
+static const struct dcmipp_capture_pix_map dcmipp_capture_dump_pix_map_list[] = {
PIXMAP_MBUS_PFMT(RGB565_2X8_LE, RGB565),
PIXMAP_MBUS_PFMT(RGB565_1X16, RGB565),
PIXMAP_MBUS_PFMT(RGB888_1X24, RGB24),
@@ -153,7 +153,7 @@ static const struct dcmipp_bytecap_pix_map dcmipp_bytecap_dump_pix_map_list[] =
.swap_uv = swap, \
}
-static const struct dcmipp_bytecap_pix_map dcmipp_bytecap_pixel_pix_map_list[] = {
+static const struct dcmipp_capture_pix_map dcmipp_capture_pixel_pix_map_list[] = {
/* Coplanar formats are supported on main & aux pipe */
PIXMAP_MBUS_PIXEL_PFMT(RGB888_1X24, RGB565, 1, DCMIPP_PxPPCR_FORMAT_RGB565, 0),
PIXMAP_MBUS_PIXEL_PFMT(YUV8_1X24, YUYV, 1, DCMIPP_PxPPCR_FORMAT_YUYV, 0),
@@ -188,7 +188,7 @@ struct dcmipp_buf {
struct list_head list;
};
-struct dcmipp_bytecap_device {
+struct dcmipp_capture_device {
struct dcmipp_ent_device ved;
struct video_device vdev;
struct device *dev;
@@ -220,7 +220,7 @@ struct dcmipp_bytecap_device {
u32 pipe_id;
- const struct dcmipp_bytecap_pix_map *pix_map;
+ const struct dcmipp_capture_pix_map *pix_map;
unsigned int pix_map_array_size;
u32 cmsr2;
@@ -238,8 +238,8 @@ struct dcmipp_bytecap_device {
} count;
};
-static const struct dcmipp_bytecap_pix_map *
-dcmipp_bytecap_pix_map_by_pixelformat(struct dcmipp_bytecap_device *vcap,
+static const struct dcmipp_capture_pix_map *
+dcmipp_capture_pix_map_by_pixelformat(struct dcmipp_capture_device *vcap,
u32 pixelformat)
{
for (unsigned int i = 0; i < vcap->pix_map_array_size; i++) {
@@ -250,11 +250,11 @@ dcmipp_bytecap_pix_map_by_pixelformat(struct dcmipp_bytecap_device *vcap,
return NULL;
}
-static bool dcmipp_bytecap_is_format_valid(struct dcmipp_bytecap_device *vcap,
+static bool dcmipp_capture_is_format_valid(struct dcmipp_capture_device *vcap,
unsigned int pixelformat)
{
- const struct dcmipp_bytecap_pix_map *vpix =
- dcmipp_bytecap_pix_map_by_pixelformat(vcap, pixelformat);
+ const struct dcmipp_capture_pix_map *vpix =
+ dcmipp_capture_pix_map_by_pixelformat(vcap, pixelformat);
if (!vpix || (vpix->plane_nb > 1 && vcap->pipe_id != 1))
return false;
@@ -342,7 +342,7 @@ static inline int frame_planes(dma_addr_t base_addr, dma_addr_t addrs[],
return 0;
}
-static int dcmipp_bytecap_querycap(struct file *file, void *priv,
+static int dcmipp_capture_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
strscpy(cap->driver, DCMIPP_PDEV_NAME, sizeof(cap->driver));
@@ -351,20 +351,20 @@ static int dcmipp_bytecap_querycap(struct file *file, void *priv,
return 0;
}
-static int dcmipp_bytecap_g_fmt_vid_cap(struct file *file, void *priv,
+static int dcmipp_capture_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct dcmipp_bytecap_device *vcap = video_drvdata(file);
+ struct dcmipp_capture_device *vcap = video_drvdata(file);
f->fmt.pix = vcap->format;
return 0;
}
-static int dcmipp_bytecap_try_fmt_vid_cap(struct file *file, void *priv,
+static int dcmipp_capture_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct dcmipp_bytecap_device *vcap = video_drvdata(file);
+ struct dcmipp_capture_device *vcap = video_drvdata(file);
struct v4l2_pix_format *format = &f->fmt.pix;
/* Take into consideration the width constraint of the pixel packer */
unsigned int walign = (vcap->pipe_id != 0 ?
@@ -372,7 +372,7 @@ static int dcmipp_bytecap_try_fmt_vid_cap(struct file *file, void *priv,
u32 in_w, in_h;
/* Don't accept a pixelformat that is not on the table */
- if (!dcmipp_bytecap_is_format_valid(vcap, format->pixelformat))
+ if (!dcmipp_capture_is_format_valid(vcap, format->pixelformat))
format->pixelformat = fmt_default.pixelformat;
/* Adjust width & height */
@@ -402,17 +402,17 @@ static int dcmipp_bytecap_try_fmt_vid_cap(struct file *file, void *priv,
return 0;
}
-static int dcmipp_bytecap_s_fmt_vid_cap(struct file *file, void *priv,
+static int dcmipp_capture_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct dcmipp_bytecap_device *vcap = video_drvdata(file);
+ struct dcmipp_capture_device *vcap = video_drvdata(file);
int ret;
/* Do not change the format while stream is on */
if (vb2_is_busy(&vcap->queue))
return -EBUSY;
- ret = dcmipp_bytecap_try_fmt_vid_cap(file, priv, f);
+ ret = dcmipp_capture_try_fmt_vid_cap(file, priv, f);
if (ret)
return ret;
@@ -434,10 +434,10 @@ static int dcmipp_bytecap_s_fmt_vid_cap(struct file *file, void *priv,
return 0;
}
-static int dcmipp_bytecap_enum_fmt_vid_cap(struct file *file, void *priv,
+static int dcmipp_capture_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f)
{
- struct dcmipp_bytecap_device *vcap = video_drvdata(file);
+ struct dcmipp_capture_device *vcap = video_drvdata(file);
unsigned int index = f->index;
unsigned int i, prev_pixelformat = 0;
@@ -475,17 +475,17 @@ static int dcmipp_bytecap_enum_fmt_vid_cap(struct file *file, void *priv,
return 0;
}
-static int dcmipp_bytecap_enum_framesizes(struct file *file, void *fh,
+static int dcmipp_capture_enum_framesizes(struct file *file, void *fh,
struct v4l2_frmsizeenum *fsize)
{
- struct dcmipp_bytecap_device *vcap = video_drvdata(file);
+ struct dcmipp_capture_device *vcap = video_drvdata(file);
if (fsize->index)
return -EINVAL;
/* Only accept code in the pix map table */
- if (!dcmipp_bytecap_is_format_valid(vcap, fsize->pixel_format))
+ if (!dcmipp_capture_is_format_valid(vcap, fsize->pixel_format))
return -EINVAL;
fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
@@ -499,7 +499,7 @@ static int dcmipp_bytecap_enum_framesizes(struct file *file, void *fh,
return 0;
}
-static const struct v4l2_file_operations dcmipp_bytecap_fops = {
+static const struct v4l2_file_operations dcmipp_capture_fops = {
.owner = THIS_MODULE,
.open = v4l2_fh_open,
.release = vb2_fop_release,
@@ -509,14 +509,14 @@ static const struct v4l2_file_operations dcmipp_bytecap_fops = {
.mmap = vb2_fop_mmap,
};
-static const struct v4l2_ioctl_ops dcmipp_bytecap_ioctl_ops = {
- .vidioc_querycap = dcmipp_bytecap_querycap,
+static const struct v4l2_ioctl_ops dcmipp_capture_ioctl_ops = {
+ .vidioc_querycap = dcmipp_capture_querycap,
- .vidioc_g_fmt_vid_cap = dcmipp_bytecap_g_fmt_vid_cap,
- .vidioc_s_fmt_vid_cap = dcmipp_bytecap_s_fmt_vid_cap,
- .vidioc_try_fmt_vid_cap = dcmipp_bytecap_try_fmt_vid_cap,
- .vidioc_enum_fmt_vid_cap = dcmipp_bytecap_enum_fmt_vid_cap,
- .vidioc_enum_framesizes = dcmipp_bytecap_enum_framesizes,
+ .vidioc_g_fmt_vid_cap = dcmipp_capture_g_fmt_vid_cap,
+ .vidioc_s_fmt_vid_cap = dcmipp_capture_s_fmt_vid_cap,
+ .vidioc_try_fmt_vid_cap = dcmipp_capture_try_fmt_vid_cap,
+ .vidioc_enum_fmt_vid_cap = dcmipp_capture_enum_fmt_vid_cap,
+ .vidioc_enum_framesizes = dcmipp_capture_enum_framesizes,
.vidioc_reqbufs = vb2_ioctl_reqbufs,
.vidioc_create_bufs = vb2_ioctl_create_bufs,
@@ -529,7 +529,7 @@ static const struct v4l2_ioctl_ops dcmipp_bytecap_ioctl_ops = {
.vidioc_streamoff = vb2_ioctl_streamoff,
};
-static void dcmipp_start_capture(struct dcmipp_bytecap_device *vcap,
+static void dcmipp_start_capture(struct dcmipp_capture_device *vcap,
struct dcmipp_buf *buf)
{
/* Set buffer address */
@@ -556,7 +556,7 @@ static void dcmipp_start_capture(struct dcmipp_bytecap_device *vcap,
reg_set(vcap, DCMIPP_PxFCTCR(vcap->pipe_id), DCMIPP_PxFCTCR_CPTREQ);
}
-static void dcmipp_bytecap_all_buffers_done(struct dcmipp_bytecap_device *vcap,
+static void dcmipp_capture_all_buffers_done(struct dcmipp_capture_device *vcap,
enum vb2_buffer_state state)
{
struct dcmipp_buf *buf, *node;
@@ -567,10 +567,10 @@ static void dcmipp_bytecap_all_buffers_done(struct dcmipp_bytecap_device *vcap,
}
}
-static int dcmipp_bytecap_start_streaming(struct vb2_queue *vq,
+static int dcmipp_capture_start_streaming(struct vb2_queue *vq,
unsigned int count)
{
- struct dcmipp_bytecap_device *vcap = vb2_get_drv_priv(vq);
+ struct dcmipp_capture_device *vcap = vb2_get_drv_priv(vq);
struct media_entity *entity = &vcap->vdev.entity;
struct dcmipp_buf *buf;
struct media_pad *pad;
@@ -581,7 +581,7 @@ static int dcmipp_bytecap_start_streaming(struct vb2_queue *vq,
/*
* Get source subdev - since link is IMMUTABLE, pointer is cached
- * within the dcmipp_bytecap_device structure
+ * within the dcmipp_capture_device structure
*/
if (!vcap->s_subdev) {
pad = media_pad_remote_pad_first(&vcap->vdev.entity.pads[0]);
@@ -613,8 +613,8 @@ static int dcmipp_bytecap_start_streaming(struct vb2_queue *vq,
spin_lock_irq(&vcap->irqlock);
if (vcap->pipe_id != 0) {
- const struct dcmipp_bytecap_pix_map *vpix =
- dcmipp_bytecap_pix_map_by_pixelformat(vcap, vcap->format.pixelformat);
+ const struct dcmipp_capture_pix_map *vpix =
+ dcmipp_capture_pix_map_by_pixelformat(vcap, vcap->format.pixelformat);
unsigned int ppcr = 0;
/*
@@ -663,14 +663,14 @@ static int dcmipp_bytecap_start_streaming(struct vb2_queue *vq,
* Return all buffers to vb2 in QUEUED state.
* This will give ownership back to userspace
*/
- dcmipp_bytecap_all_buffers_done(vcap, VB2_BUF_STATE_QUEUED);
+ dcmipp_capture_all_buffers_done(vcap, VB2_BUF_STATE_QUEUED);
vcap->active = NULL;
spin_unlock_irq(&vcap->irqlock);
return ret;
}
-static void dcmipp_dump_status(struct dcmipp_bytecap_device *vcap)
+static void dcmipp_dump_status(struct dcmipp_capture_device *vcap)
{
struct device *dev = vcap->dev;
@@ -686,9 +686,9 @@ static void dcmipp_dump_status(struct dcmipp_bytecap_device *vcap)
* Stop the stream engine. Any remaining buffers in the stream queue are
* dequeued and passed on to the vb2 framework marked as STATE_ERROR.
*/
-static void dcmipp_bytecap_stop_streaming(struct vb2_queue *vq)
+static void dcmipp_capture_stop_streaming(struct vb2_queue *vq)
{
- struct dcmipp_bytecap_device *vcap = vb2_get_drv_priv(vq);
+ struct dcmipp_capture_device *vcap = vb2_get_drv_priv(vq);
int ret;
u32 status;
@@ -726,7 +726,7 @@ static void dcmipp_bytecap_stop_streaming(struct vb2_queue *vq)
spin_lock_irq(&vcap->irqlock);
/* Return all queued buffers to vb2 in ERROR state */
- dcmipp_bytecap_all_buffers_done(vcap, VB2_BUF_STATE_ERROR);
+ dcmipp_capture_all_buffers_done(vcap, VB2_BUF_STATE_ERROR);
INIT_LIST_HEAD(&vcap->buffers);
vcap->active = NULL;
@@ -746,9 +746,9 @@ static void dcmipp_bytecap_stop_streaming(struct vb2_queue *vq)
vcap->count.underrun, vcap->count.buffers);
}
-static int dcmipp_bytecap_buf_prepare(struct vb2_buffer *vb)
+static int dcmipp_capture_buf_prepare(struct vb2_buffer *vb)
{
- struct dcmipp_bytecap_device *vcap = vb2_get_drv_priv(vb->vb2_queue);
+ struct dcmipp_capture_device *vcap = vb2_get_drv_priv(vb->vb2_queue);
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct dcmipp_buf *buf = container_of(vbuf, struct dcmipp_buf, vb);
struct v4l2_pix_format *format = &vcap->format;
@@ -798,9 +798,9 @@ static int dcmipp_bytecap_buf_prepare(struct vb2_buffer *vb)
return 0;
}
-static void dcmipp_bytecap_buf_queue(struct vb2_buffer *vb2_buf)
+static void dcmipp_capture_buf_queue(struct vb2_buffer *vb2_buf)
{
- struct dcmipp_bytecap_device *vcap =
+ struct dcmipp_capture_device *vcap =
vb2_get_drv_priv(vb2_buf->vb2_queue);
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2_buf);
struct dcmipp_buf *buf = container_of(vbuf, struct dcmipp_buf, vb);
@@ -824,13 +824,13 @@ static void dcmipp_bytecap_buf_queue(struct vb2_buffer *vb2_buf)
spin_unlock_irq(&vcap->irqlock);
}
-static int dcmipp_bytecap_queue_setup(struct vb2_queue *vq,
+static int dcmipp_capture_queue_setup(struct vb2_queue *vq,
unsigned int *nbuffers,
unsigned int *nplanes,
unsigned int sizes[],
struct device *alloc_devs[])
{
- struct dcmipp_bytecap_device *vcap = vb2_get_drv_priv(vq);
+ struct dcmipp_capture_device *vcap = vb2_get_drv_priv(vq);
unsigned int size;
size = vcap->format.sizeimage;
@@ -848,7 +848,7 @@ static int dcmipp_bytecap_queue_setup(struct vb2_queue *vq,
return 0;
}
-static int dcmipp_bytecap_buf_init(struct vb2_buffer *vb)
+static int dcmipp_capture_buf_init(struct vb2_buffer *vb)
{
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct dcmipp_buf *buf = container_of(vbuf, struct dcmipp_buf, vb);
@@ -858,19 +858,19 @@ static int dcmipp_bytecap_buf_init(struct vb2_buffer *vb)
return 0;
}
-static const struct vb2_ops dcmipp_bytecap_qops = {
- .start_streaming = dcmipp_bytecap_start_streaming,
- .stop_streaming = dcmipp_bytecap_stop_streaming,
- .buf_init = dcmipp_bytecap_buf_init,
- .buf_prepare = dcmipp_bytecap_buf_prepare,
- .buf_queue = dcmipp_bytecap_buf_queue,
- .queue_setup = dcmipp_bytecap_queue_setup,
+static const struct vb2_ops dcmipp_capture_qops = {
+ .start_streaming = dcmipp_capture_start_streaming,
+ .stop_streaming = dcmipp_capture_stop_streaming,
+ .buf_init = dcmipp_capture_buf_init,
+ .buf_prepare = dcmipp_capture_buf_prepare,
+ .buf_queue = dcmipp_capture_buf_queue,
+ .queue_setup = dcmipp_capture_queue_setup,
};
-static void dcmipp_bytecap_release(struct video_device *vdev)
+static void dcmipp_capture_release(struct video_device *vdev)
{
- struct dcmipp_bytecap_device *vcap =
- container_of(vdev, struct dcmipp_bytecap_device, vdev);
+ struct dcmipp_capture_device *vcap =
+ container_of(vdev, struct dcmipp_capture_device, vdev);
dcmipp_pads_cleanup(vcap->ved.pads);
mutex_destroy(&vcap->lock);
@@ -878,16 +878,16 @@ static void dcmipp_bytecap_release(struct video_device *vdev)
kfree(vcap);
}
-void dcmipp_bytecap_ent_release(struct dcmipp_ent_device *ved)
+void dcmipp_capture_ent_release(struct dcmipp_ent_device *ved)
{
- struct dcmipp_bytecap_device *vcap =
- container_of(ved, struct dcmipp_bytecap_device, ved);
+ struct dcmipp_capture_device *vcap =
+ container_of(ved, struct dcmipp_capture_device, ved);
media_entity_cleanup(ved->ent);
vb2_video_unregister_device(&vcap->vdev);
}
-static void dcmipp_buffer_done(struct dcmipp_bytecap_device *vcap,
+static void dcmipp_buffer_done(struct dcmipp_capture_device *vcap,
struct dcmipp_buf *buf,
size_t bytesused,
int err)
@@ -911,7 +911,7 @@ static void dcmipp_buffer_done(struct dcmipp_bytecap_device *vcap,
/* irqlock must be held */
static void
-dcmipp_bytecap_set_next_frame_or_stop(struct dcmipp_bytecap_device *vcap)
+dcmipp_capture_set_next_frame_or_stop(struct dcmipp_capture_device *vcap)
{
if (!vcap->next && list_is_singular(&vcap->buffers)) {
/*
@@ -949,7 +949,7 @@ dcmipp_bytecap_set_next_frame_or_stop(struct dcmipp_bytecap_device *vcap)
}
/* irqlock must be held */
-static void dcmipp_bytecap_process_frame(struct dcmipp_bytecap_device *vcap,
+static void dcmipp_capture_process_frame(struct dcmipp_capture_device *vcap,
size_t bytesused)
{
int err = 0;
@@ -975,10 +975,10 @@ static void dcmipp_bytecap_process_frame(struct dcmipp_bytecap_device *vcap,
vcap->active = NULL;
}
-static irqreturn_t dcmipp_bytecap_irq_thread(int irq, void *arg)
+static irqreturn_t dcmipp_capture_irq_thread(int irq, void *arg)
{
- struct dcmipp_bytecap_device *vcap =
- container_of(arg, struct dcmipp_bytecap_device, ved);
+ struct dcmipp_capture_device *vcap =
+ container_of(arg, struct dcmipp_capture_device, ved);
u32 cmsr2_pxframef;
u32 cmsr2_pxvsyncf;
u32 cmsr2_pxovrf;
@@ -1008,7 +1008,7 @@ static irqreturn_t dcmipp_bytecap_irq_thread(int irq, void *arg)
bytesused = reg_read(vcap, DCMIPP_P0DCCNTR);
else
bytesused = vcap->format.sizeimage;
- dcmipp_bytecap_process_frame(vcap, bytesused);
+ dcmipp_capture_process_frame(vcap, bytesused);
}
if (vcap->cmsr2 & cmsr2_pxvsyncf) {
@@ -1028,7 +1028,7 @@ static irqreturn_t dcmipp_bytecap_irq_thread(int irq, void *arg)
* active (but not used) buffer and put it back into next.
*/
swap(vcap->active, vcap->next);
- dcmipp_bytecap_set_next_frame_or_stop(vcap);
+ dcmipp_capture_set_next_frame_or_stop(vcap);
}
out:
@@ -1036,10 +1036,10 @@ static irqreturn_t dcmipp_bytecap_irq_thread(int irq, void *arg)
return IRQ_HANDLED;
}
-static irqreturn_t dcmipp_bytecap_irq_callback(int irq, void *arg)
+static irqreturn_t dcmipp_capture_irq_callback(int irq, void *arg)
{
- struct dcmipp_bytecap_device *vcap =
- container_of(arg, struct dcmipp_bytecap_device, ved);
+ struct dcmipp_capture_device *vcap =
+ container_of(arg, struct dcmipp_capture_device, ved);
struct dcmipp_ent_device *ved = arg;
/* Store interrupt status register */
@@ -1054,12 +1054,12 @@ static irqreturn_t dcmipp_bytecap_irq_callback(int irq, void *arg)
return IRQ_WAKE_THREAD;
}
-static int dcmipp_bytecap_link_validate(struct media_link *link)
+static int dcmipp_capture_link_validate(struct media_link *link)
{
struct media_entity *entity = link->sink->entity;
struct video_device *vd = media_entity_to_video_device(entity);
- struct dcmipp_bytecap_device *vcap = container_of(vd,
- struct dcmipp_bytecap_device, vdev);
+ struct dcmipp_capture_device *vcap = container_of(vd,
+ struct dcmipp_capture_device, vdev);
struct v4l2_subdev *source_sd =
media_entity_to_v4l2_subdev(link->source->entity);
struct v4l2_subdev_format source_fmt = {
@@ -1115,8 +1115,8 @@ static int dcmipp_bytecap_link_validate(struct media_link *link)
return 0;
}
-static const struct media_entity_operations dcmipp_bytecap_entity_ops = {
- .link_validate = dcmipp_bytecap_link_validate,
+static const struct media_entity_operations dcmipp_capture_entity_ops = {
+ .link_validate = dcmipp_capture_link_validate,
};
static int dcmipp_name_to_pipe_id(const char *name)
@@ -1131,17 +1131,17 @@ static int dcmipp_name_to_pipe_id(const char *name)
return -EINVAL;
}
-struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
+struct dcmipp_ent_device *dcmipp_capture_ent_init(const char *entity_name,
struct dcmipp_device *dcmipp)
{
- struct dcmipp_bytecap_device *vcap;
+ struct dcmipp_capture_device *vcap;
struct device *dev = dcmipp->dev;
struct video_device *vdev;
struct vb2_queue *q;
const unsigned long pad_flag = MEDIA_PAD_FL_SINK;
int ret = 0;
- /* Allocate the dcmipp_bytecap_device struct */
+ /* Allocate the dcmipp_capture_device struct */
vcap = kzalloc(sizeof(*vcap), GFP_KERNEL);
if (!vcap)
return ERR_PTR(-ENOMEM);
@@ -1155,11 +1155,11 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
/* Initialize supported format table format */
if (vcap->pipe_id == 0) {
- vcap->pix_map = dcmipp_bytecap_dump_pix_map_list;
- vcap->pix_map_array_size = ARRAY_SIZE(dcmipp_bytecap_dump_pix_map_list);
+ vcap->pix_map = dcmipp_capture_dump_pix_map_list;
+ vcap->pix_map_array_size = ARRAY_SIZE(dcmipp_capture_dump_pix_map_list);
} else {
- vcap->pix_map = dcmipp_bytecap_pixel_pix_map_list;
- vcap->pix_map_array_size = ARRAY_SIZE(dcmipp_bytecap_pixel_pix_map_list);
+ vcap->pix_map = dcmipp_capture_pixel_pix_map_list;
+ vcap->pix_map_array_size = ARRAY_SIZE(dcmipp_capture_pixel_pix_map_list);
}
/* Allocate the pads */
@@ -1174,7 +1174,7 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
/* Initialize the media entity */
vcap->vdev.entity.name = entity_name;
vcap->vdev.entity.function = MEDIA_ENT_F_IO_V4L;
- vcap->vdev.entity.ops = &dcmipp_bytecap_entity_ops;
+ vcap->vdev.entity.ops = &dcmipp_capture_entity_ops;
ret = media_entity_pads_init(&vcap->vdev.entity, 1, vcap->ved.pads);
if (ret)
goto err_clean_pads;
@@ -1189,7 +1189,7 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
q->lock = &vcap->lock;
q->drv_priv = vcap;
q->buf_struct_size = sizeof(struct dcmipp_buf);
- q->ops = &dcmipp_bytecap_qops;
+ q->ops = &dcmipp_capture_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->min_queued_buffers = 1;
@@ -1218,8 +1218,8 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
/* Fill the dcmipp_ent_device struct */
vcap->ved.ent = &vcap->vdev.entity;
- vcap->ved.handler = dcmipp_bytecap_irq_callback;
- vcap->ved.thread_fn = dcmipp_bytecap_irq_thread;
+ vcap->ved.handler = dcmipp_capture_irq_callback;
+ vcap->ved.thread_fn = dcmipp_capture_irq_thread;
vcap->dev = dev;
vcap->regs = dcmipp->regs;
@@ -1227,9 +1227,9 @@ struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
vdev = &vcap->vdev;
vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
V4L2_CAP_IO_MC;
- vdev->release = dcmipp_bytecap_release;
- vdev->fops = &dcmipp_bytecap_fops;
- vdev->ioctl_ops = &dcmipp_bytecap_ioctl_ops;
+ vdev->release = dcmipp_capture_release;
+ vdev->fops = &dcmipp_capture_fops;
+ vdev->ioctl_ops = &dcmipp_capture_ioctl_ops;
vdev->lock = &vcap->lock;
vdev->queue = q;
vdev->v4l2_dev = &dcmipp->v4l2_dev;
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h
index 8f41473605aa..c0f7ed3acbfc 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h
@@ -279,9 +279,9 @@ struct dcmipp_ent_device *
dcmipp_byteproc_ent_init(const char *entity_name,
struct dcmipp_device *dcmipp);
void dcmipp_byteproc_ent_release(struct dcmipp_ent_device *ved);
-struct dcmipp_ent_device *dcmipp_bytecap_ent_init(const char *entity_name,
+struct dcmipp_ent_device *dcmipp_capture_ent_init(const char *entity_name,
struct dcmipp_device *dcmipp);
-void dcmipp_bytecap_ent_release(struct dcmipp_ent_device *ved);
+void dcmipp_capture_ent_release(struct dcmipp_ent_device *ved);
struct dcmipp_ent_device *dcmipp_isp_ent_init(const char *entity_name,
struct dcmipp_device *dcmipp);
void dcmipp_isp_ent_release(struct dcmipp_ent_device *ved);
diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
index 9aba16096d28..a52b3b0e3c37 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
@@ -50,8 +50,8 @@ static const struct dcmipp_ent_config stm32mp13_ent_config[] = {
},
{
.name = "dcmipp_dump_capture",
- .init = dcmipp_bytecap_ent_init,
- .release = dcmipp_bytecap_ent_release,
+ .init = dcmipp_capture_ent_init,
+ .release = dcmipp_capture_ent_release,
},
};
@@ -88,8 +88,8 @@ static const struct dcmipp_ent_config stm32mp25_ent_config[] = {
},
{
.name = "dcmipp_dump_capture",
- .init = dcmipp_bytecap_ent_init,
- .release = dcmipp_bytecap_ent_release,
+ .init = dcmipp_capture_ent_init,
+ .release = dcmipp_capture_ent_release,
},
};
--
2.34.1© 2016 - 2026 Red Hat, Inc.