hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] soc-camera: make .clock_{start,stop} compulsory, .add / .remove optional 

All existing soc-camera host drivers use .clock_start() and .clock_stop()
callbacks to activate and deactivate their camera interfaces, whereas
.add() and .remove() callbacks are usually dummy. Make the former two
compulsory and the latter two optional.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2013-04-04 13:19:58 -03:00 committed by Mauro Carvalho Chehab
parent 0ff6a6e8fb
commit a78fcc1126
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/platform/soc_camera/soc_camera.c
View File

@ -512,23 +512,22 @@ static int soc_camera_add_device(struct soc_camera_device *icd)
if (ici->icd)
return -EBUSY;
if (ici->ops->clock_start) {
ret = ici->ops->clock_start(ici);
if (ret < 0)
return ret;
}
ret = ici->ops->add(icd);
ret = ici->ops->clock_start(ici);
if (ret < 0)
goto eadd;
return ret;
if (ici->ops->add) {
ret = ici->ops->add(icd);
if (ret < 0)
goto eadd;
}
ici->icd = icd;
return 0;
eadd:
if (ici->ops->clock_stop)
ici->ops->clock_stop(ici);
ici->ops->clock_stop(ici);
return ret;
}
@ -539,9 +538,9 @@ static void soc_camera_remove_device(struct soc_camera_device *icd)
if (WARN_ON(icd != ici->icd))
return;
ici->ops->remove(icd);
if (ici->ops->clock_stop)
ici->ops->clock_stop(ici);
if (ici->ops->remove)
ici->ops->remove(icd);
ici->ops->clock_stop(ici);
ici->icd = NULL;
}
@ -1383,8 +1382,8 @@ int soc_camera_host_register(struct soc_camera_host *ici)
((!ici->ops->init_videobuf ||
!ici->ops->reqbufs) &&
!ici->ops->init_videobuf2) ||
!ici->ops->add ||
!ici->ops->remove ||
!ici->ops->clock_start ||
!ici->ops->clock_stop ||
!ici->ops->poll ||
!ici->v4l2_dev.dev)
return -EINVAL;