diff options
| author | Guennadi Liakhovetski | 2011-06-29 12:43:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-07-27 22:56:07 +0200 |
| commit | 033d7463f816315308ffec6f69576d820bfbab0c (patch) | |
| tree | 1f31fa5e319133056c7942745e6d8d0ae60100d0 | |
| parent | [media] V4L: pxa-camera: switch to using standard PM hooks (diff) | |
| download | kernel-qcow2-linux-033d7463f816315308ffec6f69576d820bfbab0c.tar.gz kernel-qcow2-linux-033d7463f816315308ffec6f69576d820bfbab0c.tar.xz kernel-qcow2-linux-033d7463f816315308ffec6f69576d820bfbab0c.zip | |
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/soc_camera.c | 26 | ||||
| -rw-r--r-- | 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 136326e8c4b0..5084e72d4965 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 21dd8a41f4c1..70c4ea5ecc31 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 |