From c3f98052437e4abbaaec030005a0891ec1d71e0a Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 29 Jun 2011 07:43:48 -0300
Subject: [PATCH] --- yaml --- r: 261595 b: refs/heads/master c:
 033d7463f816315308ffec6f69576d820bfbab0c h: refs/heads/master i:   261593:
 4dd9a5de8ca4c7f70a0fe1ca0a93ba63df4e4fb7   261591:
 a4a7a59fbe292e31ce13cad010af417124495528 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/soc_camera.c | 26 --------------------------
 trunk/include/media/soc_camera.h       |  2 --
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index 0c123a4e0c6f..3acf273c5c51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7254026cedd42d75009f8a7f2999045007dd444e
+refs/heads/master: 033d7463f816315308ffec6f69576d820bfbab0c
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index 136326e8c4b0..5084e72d4965 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -1209,36 +1209,10 @@ static int soc_camera_remove(struct device *dev)
 	return 0;
 }
 
-static int soc_camera_suspend(struct device *dev, pm_message_t state)
-{
-	struct soc_camera_device *icd = to_soc_camera_dev(dev);
-	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-	int ret = 0;
-
-	if (ici->ops->suspend)
-		ret = ici->ops->suspend(icd, state);
-
-	return ret;
-}
-
-static int soc_camera_resume(struct device *dev)
-{
-	struct soc_camera_device *icd = to_soc_camera_dev(dev);
-	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
-	int ret = 0;
-
-	if (ici->ops->resume)
-		ret = ici->ops->resume(icd);
-
-	return ret;
-}
-
 struct bus_type soc_camera_bus_type = {
 	.name		= "soc-camera",
 	.probe		= soc_camera_probe,
 	.remove		= soc_camera_remove,
-	.suspend	= soc_camera_suspend,
-	.resume		= soc_camera_resume,
 };
 EXPORT_SYMBOL_GPL(soc_camera_bus_type);
 
diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h
index 21dd8a41f4c1..70c4ea5ecc31 100644
--- a/trunk/include/media/soc_camera.h
+++ b/trunk/include/media/soc_camera.h
@@ -66,8 +66,6 @@ struct soc_camera_host_ops {
 	struct module *owner;
 	int (*add)(struct soc_camera_device *);
 	void (*remove)(struct soc_camera_device *);
-	int (*suspend)(struct soc_camera_device *, pm_message_t);
-	int (*resume)(struct soc_camera_device *);
 	/*
 	 * .get_formats() is called for each client device format, but
 	 * .put_formats() is only called once. Further, if any of the calls to