Skip to content

Commit

Permalink
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 7254026 commit 033d746
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
26 changes: 0 additions & 26 deletions drivers/media/video/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions include/media/soc_camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 033d746

Please sign in to comment.