Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 033d7463 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7254026c

drivers/media/video/soc_camera.c

+0 −26
Original line number Diff line number Diff line
@@ -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);

include/media/soc_camera.h

+0 −2
Original line number Diff line number Diff line
@@ -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