Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[media] soc-camera: Compile fixes for mx2-camera
mx2-camera got broken during the last merge window. This patch
fixes this and removes some unused variables.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
authored by Sascha Hauer and committed by Mauro Carvalho Chehab 6b101926 d889eb1e
+5
-8
drivers/media/video/mx2_camera.c
+5
-8
drivers/media/video/mx2_camera.c
···
31
31
32
32
#include <media/v4l2-common.h>
33
33
#include <media/v4l2-dev.h>
34
+
#include <media/videobuf-core.h>
34
35
#include <media/videobuf-dma-contig.h>
35
36
#include <media/soc_camera.h>
36
37
#include <media/soc_mediabus.h>
···
904
903
static int mx2_camera_set_fmt(struct soc_camera_device *icd,
905
904
struct v4l2_format *f)
906
905
{
907
-
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
908
-
struct mx2_camera_dev *pcdev = ici->priv;
909
906
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
910
907
const struct soc_camera_format_xlate *xlate;
911
908
struct v4l2_pix_format *pix = &f->fmt.pix;
···
942
943
static int mx2_camera_try_fmt(struct soc_camera_device *icd,
943
944
struct v4l2_format *f)
944
945
{
945
-
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
946
-
struct mx2_camera_dev *pcdev = ici->priv;
947
946
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
948
947
const struct soc_camera_format_xlate *xlate;
949
948
struct v4l2_pix_format *pix = &f->fmt.pix;
···
1021
1024
return 0;
1022
1025
}
1023
1026
1024
-
static int mx2_camera_reqbufs(struct soc_camera_file *icf,
1027
+
static int mx2_camera_reqbufs(struct soc_camera_device *icd,
1025
1028
struct v4l2_requestbuffers *p)
1026
1029
{
1027
1030
int i;
1028
1031
1029
1032
for (i = 0; i < p->count; i++) {
1030
-
struct mx2_buffer *buf = container_of(icf->vb_vidq.bufs[i],
1033
+
struct mx2_buffer *buf = container_of(icd->vb_vidq.bufs[i],
1031
1034
struct mx2_buffer, vb);
1032
1035
INIT_LIST_HEAD(&buf->vb.queue);
1033
1036
}
···
1148
1151
1149
1152
static unsigned int mx2_camera_poll(struct file *file, poll_table *pt)
1150
1153
{
1151
-
struct soc_camera_file *icf = file->private_data;
1154
+
struct soc_camera_device *icd = file->private_data;
1152
1155
1153
-
return videobuf_poll_stream(file, &icf->vb_vidq, pt);
1156
+
return videobuf_poll_stream(file, &icd->vb_vidq, pt);
1154
1157
}
1155
1158
1156
1159
static struct soc_camera_host_ops mx2_soc_camera_host_ops = {