evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks

Browse source 
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>
This commit is contained in:
Guennadi Liakhovetski 2011-06-29 07:43:48 -03:00 • committed by Mauro Carvalho Chehab
parent 7254026ced
commit 033d7463f8
2 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/media/video/soc_camera.c
View file

@ -1209,36 +1209,10 @@ static int soc_camera_remove(struct device *dev)
return 0; 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 = { struct bus_type soc_camera_bus_type = {
.name = "soc-camera", .name = "soc-camera",
.probe = soc_camera_probe, .probe = soc_camera_probe,
.remove = soc_camera_remove, .remove = soc_camera_remove,
.suspend = soc_camera_suspend,
.resume = soc_camera_resume,
}; };
EXPORT_SYMBOL_GPL(soc_camera_bus_type); EXPORT_SYMBOL_GPL(soc_camera_bus_type);

2
include/media/soc_camera.h
View file

@ -66,8 +66,6 @@ struct soc_camera_host_ops {
struct module *owner; struct module *owner;
int (*add)(struct soc_camera_device *); int (*add)(struct soc_camera_device *);
void (*remove)(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 * .get_formats() is called for each client device format, but
* .put_formats() is only called once. Further, if any of the calls to * .put_formats() is only called once. Further, if any of the calls to