hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] soc_camera: remove the now obsolete struct soc_camera_ops 

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
[g.liakhovetski@gmx.de: mt9m001 hunk moved to an earlier patch]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2011-09-08 13:16:56 -03:00 committed by Mauro Carvalho Chehab
parent 41efcd7a68
commit 0934d94a52
6 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/imx074.c
View File

@ -437,7 +437,6 @@ static int imx074_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
icd->ops = NULL;
priv->fmt = &imx074_colour_fmts[0];
ret = imx074_video_probe(icd, client);

2
drivers/media/video/mt9t112.c
View File

@ -1095,8 +1095,6 @@ static int mt9t112_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
icd->ops = NULL;
ret = mt9t112_camera_probe(icd, client);
if (ret)
kfree(priv);

1
drivers/media/video/ov5642.c
View File

@ -942,7 +942,6 @@ static int ov5642_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops);
icd->ops = NULL;
priv->fmt = &ov5642_colour_fmts[0];
ret = ov5642_video_probe(icd, client);

2
drivers/media/video/soc_camera_platform.c
View File

@ -150,8 +150,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
/* Set the control device reference */
icd->control = &pdev->dev;
icd->ops = NULL;
ici = to_soc_camera_host(icd->parent);
v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);

1
drivers/media/video/tw9910.c
View File

@ -921,7 +921,6 @@ static int tw9910_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
icd->ops = NULL;
icd->iface = icl->bus_id;
ret = tw9910_video_probe(icd, client);

18
include/media/soc_camera.h
View File

@ -39,7 +39,6 @@ struct soc_camera_device {
unsigned char iface; /* Host number */
unsigned char devnum; /* Device number per host */
struct soc_camera_sense *sense; /* See comment in struct definition */
struct soc_camera_ops *ops;
struct video_device *vdev;
struct v4l2_ctrl_handler ctrl_handler;
const struct soc_camera_format_xlate *current_fmt;
@ -192,11 +191,6 @@ struct soc_camera_format_xlate {
const struct soc_mbus_pixelfmt *host_fmt;
};
struct soc_camera_ops {
const struct v4l2_queryctrl *controls;
int num_controls;
};
#define SOCAM_SENSE_PCLK_CHANGED (1 << 0)
/**
@ -223,18 +217,6 @@ struct soc_camera_sense {
unsigned long pixel_clock;
};
static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
struct soc_camera_ops *ops, int id)
{
int i;
for (i = 0; i < ops->num_controls; i++)
if (ops->controls[i].id == id)
return &ops->controls[i];
return NULL;
}
#define SOCAM_DATAWIDTH(x) BIT((x) - 1)
#define SOCAM_DATAWIDTH_4 SOCAM_DATAWIDTH(4)
#define SOCAM_DATAWIDTH_8 SOCAM_DATAWIDTH(8)