aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 10:53:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:19:18 -0400
commita4c56fd8892e51d675f7665ddee4fd9d7e5c2cc3 (patch)
treebf19f94a6bf467e2a366a9de9a229ff1149baf76 /drivers/media/video/soc_camera.c
parent6a6c8786725c0b3d143674effa8b772f47b1c189 (diff)
V4L/DVB (12535): soc-camera: remove .init() and .release() methods from struct soc_camera_ops
Remove unneeded soc-camera operations, this also makes the soc-camera API to v4l2 subdevices thinner. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 86e0648f65a0..27921162514c 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -385,12 +385,6 @@ static int soc_camera_open(struct file *file)
385 goto eiciadd; 385 goto eiciadd;
386 } 386 }
387 387
388 if (icd->ops->init) {
389 ret = icd->ops->init(icd);
390 if (ret < 0)
391 goto einit;
392 }
393
394 /* Try to configure with default parameters */ 388 /* Try to configure with default parameters */
395 ret = soc_camera_set_fmt(icf, &f); 389 ret = soc_camera_set_fmt(icf, &f);
396 if (ret < 0) 390 if (ret < 0)
@@ -411,9 +405,6 @@ static int soc_camera_open(struct file *file)
411 * and use_count == 1 405 * and use_count == 1
412 */ 406 */
413esfmt: 407esfmt:
414 if (icd->ops->release)
415 icd->ops->release(icd);
416einit:
417 ici->ops->remove(icd); 408 ici->ops->remove(icd);
418eiciadd: 409eiciadd:
419 if (icl->power) 410 if (icl->power)
@@ -438,8 +429,6 @@ static int soc_camera_close(struct file *file)
438 if (!icd->use_count) { 429 if (!icd->use_count) {
439 struct soc_camera_link *icl = to_soc_camera_link(icd); 430 struct soc_camera_link *icl = to_soc_camera_link(icd);
440 431
441 if (icd->ops->release)
442 icd->ops->release(icd);
443 ici->ops->remove(icd); 432 ici->ops->remove(icd);
444 if (icl->power) 433 if (icl->power)
445 icl->power(icd->pdev, 0); 434 icl->power(icd->pdev, 0);