Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 033d7463f816315308ffec6f69576d820bfbab0c

Authored by Guennadi Liakhovetski
Committed by Mauro Carvalho Chehab
1 parent 7254026ced
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 2 changed files with 0 additions and 28 deletions Side-by-side Diff

drivers/media/video/soc_camera.c
Diff comments   View file @ 033d746
... ... @@ -1209,36 +1209,10 @@
1209 1209 return 0;
1210 1210 }
1211 1211  
1212   -static int soc_camera_suspend(struct device *dev, pm_message_t state)
1213   -{
1214   - struct soc_camera_device *icd = to_soc_camera_dev(dev);
1215   - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
1216   - int ret = 0;
1217   -
1218   - if (ici->ops->suspend)
1219   - ret = ici->ops->suspend(icd, state);
1220   -
1221   - return ret;
1222   -}
1223   -
1224   -static int soc_camera_resume(struct device *dev)
1225   -{
1226   - struct soc_camera_device *icd = to_soc_camera_dev(dev);
1227   - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
1228   - int ret = 0;
1229   -
1230   - if (ici->ops->resume)
1231   - ret = ici->ops->resume(icd);
1232   -
1233   - return ret;
1234   -}
1235   -
1236 1212 struct bus_type soc_camera_bus_type = {
1237 1213 .name = "soc-camera",
1238 1214 .probe = soc_camera_probe,
1239 1215 .remove = soc_camera_remove,
1240   - .suspend = soc_camera_suspend,
1241   - .resume = soc_camera_resume,
1242 1216 };
1243 1217 EXPORT_SYMBOL_GPL(soc_camera_bus_type);
1244 1218  
include/media/soc_camera.h
Diff comments   View file @ 033d746
... ... @@ -66,8 +66,6 @@
66 66 struct module *owner;
67 67 int (*add)(struct soc_camera_device *);
68 68 void (*remove)(struct soc_camera_device *);
69   - int (*suspend)(struct soc_camera_device *, pm_message_t);
70   - int (*resume)(struct soc_camera_device *);
71 69 /*
72 70 * .get_formats() is called for each client device format, but
73 71 * .put_formats() is only called once. Further, if any of the calls to