From b3d50cdb03748543bffc00e71eddad951a5a13d1 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 28 Jul 2011 14:42:27 -0300
Subject: [PATCH] --- yaml --- r: 273667 b: refs/heads/master c:
 3d780ad712d3de61da5ba0ce206a261646dc68dc h: refs/heads/master i:   273665:
 3d54814e6b3772960ad56c2f7407d918adcb71fc   273663:
 c2d625c685dbbb2d4b58e34e72c9ac37fb9e9373 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/media/video/ov9740.c | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index fcd65dc03579..abc4ded7c2b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88e816a2d5d53b791d0ecc314bf2369d826be1d2
+refs/heads/master: 3d780ad712d3de61da5ba0ce206a261646dc68dc
diff --git a/trunk/drivers/media/video/ov9740.c b/trunk/drivers/media/video/ov9740.c
index 67b7020c933e..5920f600990f 100644
--- a/trunk/drivers/media/video/ov9740.c
+++ b/trunk/drivers/media/video/ov9740.c
@@ -562,25 +562,6 @@ static int ov9740_s_stream(struct v4l2_subdev *sd, int enable)
 	return ret;
 }
 
-/* Alter bus settings on camera side */
-static int ov9740_set_bus_param(struct soc_camera_device *icd,
-				unsigned long flags)
-{
-	return 0;
-}
-
-/* Request bus settings on camera side */
-static unsigned long ov9740_query_bus_param(struct soc_camera_device *icd)
-{
-	struct soc_camera_link *icl = to_soc_camera_link(icd);
-
-	unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
-		SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
-		SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
-
-	return soc_camera_apply_sensor_flags(icl, flags);
-}
-
 /* select nearest higher resolution for capture */
 static void ov9740_res_roundup(u32 *width, u32 *height)
 {
@@ -945,12 +926,11 @@ static int ov9740_video_probe(struct soc_camera_device *icd,
 }
 
 static struct soc_camera_ops ov9740_ops = {
-	.set_bus_param		= ov9740_set_bus_param,
-	.query_bus_param	= ov9740_query_bus_param,
 	.controls		= ov9740_controls,
 	.num_controls		= ARRAY_SIZE(ov9740_controls),
 };
 
+/* Request bus settings on camera side */
 static int ov9740_g_mbus_config(struct v4l2_subdev *sd,
 				struct v4l2_mbus_config *cfg)
 {