From 2e537c3d280288afa125da7a8585c7c6d323abd9 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 28 Jul 2011 18:36:01 -0300
Subject: [PATCH] --- yaml --- r: 273671 b: refs/heads/master c:
 1067247f56c5a9325332148c0dea42a2aa7e718f h: refs/heads/master i:   273669:
 609d7bc7aa72f1087352d7f91478d19fc1f06f7d   273667:
 b3d50cdb03748543bffc00e71eddad951a5a13d1   273663:
 c2d625c685dbbb2d4b58e34e72c9ac37fb9e9373 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/soc_camera_platform.c | 31 +------------------
 trunk/include/media/soc_camera_platform.h     |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 456888af228b..1bb3bcbbf535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71f5ec8406e0d2f7c85bc1207df88207cf784377
+refs/heads/master: 1067247f56c5a9325332148c0dea42a2aa7e718f
diff --git a/trunk/drivers/media/video/soc_camera_platform.c b/trunk/drivers/media/video/soc_camera_platform.c
index 7045e458a66e..f5ebe59a5555 100644
--- a/trunk/drivers/media/video/soc_camera_platform.c
+++ b/trunk/drivers/media/video/soc_camera_platform.c
@@ -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 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
 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;
diff --git a/trunk/include/media/soc_camera_platform.h b/trunk/include/media/soc_camera_platform.h
index a15f92be8aba..8aa4200a0b1d 100644
--- a/trunk/include/media/soc_camera_platform.h
+++ b/trunk/include/media/soc_camera_platform.h
@@ -21,7 +21,6 @@ struct soc_camera_platform_info {
 	const char *format_name;
 	unsigned long format_depth;
 	struct v4l2_mbus_framefmt format;
-	unsigned long bus_param;
 	unsigned long mbus_param;
 	enum v4l2_mbus_type mbus_type;
 	struct soc_camera_device *icd;