linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH 2/6] V4L: soc-camera: remove now unused soc-camera specific PM hooks
Date: Sat, 16 Jul 2011 02:13:45 +0200 (CEST)	[thread overview]
Message-ID: <Pine.LNX.4.64.1107160202390.27399@axis700.grange> (raw)
In-Reply-To: <Pine.LNX.4.64.1107160135500.27399@axis700.grange>

soc-camera host drivers shall be implementing their PM, using standard
kernel methods, soc-camera specific hooks can die.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 drivers/media/video/soc_camera.c |   26 --------------------------
 include/media/soc_camera.h       |    2 --
 2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 136326e..5084e72 100644
--- a/drivers/media/video/soc_camera.c
+++ b/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/include/media/soc_camera.h b/include/media/soc_camera.h
index 21dd8a4..70c4ea5 100644
--- a/include/media/soc_camera.h
+++ b/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
-- 
1.7.2.5


  parent reply	other threads:[~2011-07-16  0:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-16  0:13 [PATCH 0/6] soc-camera: moving closer to v4l2 interoperability Guennadi Liakhovetski
2011-07-16  0:13 ` [PATCH 1/6] V4L: pxa-camera: switch to using standard PM hooks Guennadi Liakhovetski
2011-07-16  0:13 ` Guennadi Liakhovetski [this message]
2011-07-16  0:13 ` [PATCH 3/6] V4L: soc-camera: group struct field initialisations together Guennadi Liakhovetski
2011-07-16  0:13 ` [PATCH 4/6] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier Guennadi Liakhovetski
2011-07-17 13:16   ` Paul Mundt
2011-07-16  0:13 ` [PATCH 5/6] V4L: soc-camera: un-export the soc-camera bus Guennadi Liakhovetski
2011-07-16  0:14 ` [PATCH 6/6] V4L: soc-camera: remove soc-camera bus and devices on it Guennadi Liakhovetski
2011-07-17 13:16   ` Paul Mundt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.1107160202390.27399@axis700.grange \
    --to=g.liakhovetski@gmx.de \
    --cc=linux-media@vger.kernel.org \
    --subject='Re: [PATCH 2/6] V4L: soc-camera: remove now unused soc-camera specific PM hooks' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox