From 1244fb5f3430b804ce4bebbe4c6382def6697557 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 28 Jul 2011 14:42:26 -0300
Subject: [PATCH] --- yaml --- r: 273666 b: refs/heads/master c:
 88e816a2d5d53b791d0ecc314bf2369d826be1d2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 784b4ad6749f..fcd65dc03579 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1b6b72b9a33a12efbe29f046335098c53dbb58
+refs/heads/master: 88e816a2d5d53b791d0ecc314bf2369d826be1d2
diff --git a/trunk/drivers/media/video/ov9640.c b/trunk/drivers/media/video/ov9640.c
index 4156c9f6375b..352a8fb68b84 100644
--- a/trunk/drivers/media/video/ov9640.c
+++ b/trunk/drivers/media/video/ov9640.c
@@ -286,29 +286,6 @@ static int ov9640_s_stream(struct v4l2_subdev *sd, int enable)
 	return 0;
 }
 
-/* Alter bus settings on camera side */
-static int ov9640_set_bus_param(struct soc_camera_device *icd,
-				unsigned long flags)
-{
-	return 0;
-}
-
-/* Request bus settings on camera side */
-static unsigned long ov9640_query_bus_param(struct soc_camera_device *icd)
-{
-	struct soc_camera_link *icl = to_soc_camera_link(icd);
-
-	/*
-	 * REVISIT: the camera probably can do 10 bit transfers, but I don't
-	 *          have those pins connected on my hardware.
-	 */
-	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);
-}
-
 /* Get status of additional camera capabilities */
 static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
@@ -648,8 +625,6 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 	return 0;
 }
 
-
-
 static int ov9640_video_probe(struct soc_camera_device *icd,
 				struct i2c_client *client)
 {
@@ -707,8 +682,6 @@ static int ov9640_video_probe(struct soc_camera_device *icd,
 }
 
 static struct soc_camera_ops ov9640_ops = {
-	.set_bus_param		= ov9640_set_bus_param,
-	.query_bus_param	= ov9640_query_bus_param,
 	.controls		= ov9640_controls,
 	.num_controls		= ARRAY_SIZE(ov9640_controls),
 };
@@ -724,6 +697,7 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = {
 
 };
 
+/* Request bus settings on camera side */
 static int ov9640_g_mbus_config(struct v4l2_subdev *sd,
 				struct v4l2_mbus_config *cfg)
 {