|
@@ -30,32 +30,12 @@ static struct soc_camera_platform_priv *get_priv(struct platform_device *pdev)
|
|
|
return container_of(subdev, struct soc_camera_platform_priv, subdev);
|
|
|
}
|
|
|
|
|
|
-static struct soc_camera_platform_info *get_info(struct soc_camera_device *icd)
|
|
|
-{
|
|
|
- struct platform_device *pdev =
|
|
|
- to_platform_device(to_soc_camera_control(icd));
|
|
|
- return pdev->dev.platform_data;
|
|
|
-}
|
|
|
-
|
|
|
static int soc_camera_platform_s_stream(struct v4l2_subdev *sd, int enable)
|
|
|
{
|
|
|
struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
|
|
|
return p->set_capture(p, enable);
|
|
|
}
|
|
|
|
|
|
-static int soc_camera_platform_set_bus_param(struct soc_camera_device *icd,
|
|
|
- unsigned long flags)
|
|
|
-{
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-static unsigned long
|
|
|
-soc_camera_platform_query_bus_param(struct soc_camera_device *icd)
|
|
|
-{
|
|
|
- struct soc_camera_platform_info *p = get_info(icd);
|
|
|
- return p->bus_param;
|
|
|
-}
|
|
|
-
|
|
|
static int soc_camera_platform_fill_fmt(struct v4l2_subdev *sd,
|
|
|
struct v4l2_mbus_framefmt *mf)
|
|
|
{
|
|
@@ -142,11 +122,6 @@ static struct v4l2_subdev_ops platform_subdev_ops = {
|
|
|
.video = &platform_subdev_video_ops,
|
|
|
};
|
|
|
|
|
|
-static struct soc_camera_ops soc_camera_platform_ops = {
|
|
|
- .set_bus_param = soc_camera_platform_set_bus_param,
|
|
|
- .query_bus_param = soc_camera_platform_query_bus_param,
|
|
|
-};
|
|
|
-
|
|
|
static int soc_camera_platform_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct soc_camera_host *ici;
|
|
@@ -175,7 +150,7 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
|
|
|
/* Set the control device reference */
|
|
|
icd->control = &pdev->dev;
|
|
|
|
|
|
- icd->ops = &soc_camera_platform_ops;
|
|
|
+ icd->ops = NULL;
|
|
|
|
|
|
ici = to_soc_camera_host(icd->parent);
|
|
|
|
|
@@ -190,7 +165,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
|
|
|
return ret;
|
|
|
|
|
|
evdrs:
|
|
|
- icd->ops = NULL;
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
kfree(priv);
|
|
|
return ret;
|
|
@@ -199,11 +173,8 @@ evdrs:
|
|
|
static int soc_camera_platform_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct soc_camera_platform_priv *priv = get_priv(pdev);
|
|
|
- struct soc_camera_platform_info *p = pdev->dev.platform_data;
|
|
|
- struct soc_camera_device *icd = p->icd;
|
|
|
|
|
|
v4l2_device_unregister_subdev(&priv->subdev);
|
|
|
- icd->ops = NULL;
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
kfree(priv);
|
|
|
return 0;
|