summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/m5mols/m5mols_capture.c
diff options
context:
space:
mode:
authorSylwester Nawrocki2012-04-09 18:51:56 +0200
committerMauro Carvalho Chehab2012-05-14 19:32:14 +0200
commit3c5da0baaada8e8c7176a3e310dfdb4362f74d80 (patch)
tree502bd796f303fcb4a35f0aac2a2be71e81d263ce /drivers/media/video/m5mols/m5mols_capture.c
parent[media] m5mols: Convert macros to inline functions (diff)
downloadkernel-qcow2-linux-3c5da0baaada8e8c7176a3e310dfdb4362f74d80.tar.gz
kernel-qcow2-linux-3c5da0baaada8e8c7176a3e310dfdb4362f74d80.tar.xz
kernel-qcow2-linux-3c5da0baaada8e8c7176a3e310dfdb4362f74d80.zip
[media] m5mols: Refactored controls handling
This patch is a prerequisite for the new controls addition. It consolidates the control handling code, which is moved to m5mols_controls.c and staticized. The controls initialization is reordered to better reflect the control clusters and make the diffs smaller when new controls are added. To make the code easier to follow when more controls is added use separate set function for each control. Rewrite the image effect registers handling. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/m5mols/m5mols_capture.c')
-rw-r--r--drivers/media/video/m5mols/m5mols_capture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/m5mols/m5mols_capture.c b/drivers/media/video/m5mols/m5mols_capture.c
index ba25e8e2ba4c..4f27aed11722 100644
--- a/drivers/media/video/m5mols/m5mols_capture.c
+++ b/drivers/media/video/m5mols/m5mols_capture.c
@@ -114,7 +114,7 @@ int m5mols_start_capture(struct m5mols_info *info)
* format. The frame capture is initiated during switching from Monitor
* to Capture mode.
*/
- ret = m5mols_mode(info, REG_MONITOR);
+ ret = m5mols_set_mode(info, REG_MONITOR);
if (!ret)
ret = m5mols_restore_controls(info);
if (!ret)
@@ -124,7 +124,7 @@ int m5mols_start_capture(struct m5mols_info *info)
if (!ret)
ret = m5mols_lock_3a(info, true);
if (!ret)
- ret = m5mols_mode(info, REG_CAPTURE);
+ ret = m5mols_set_mode(info, REG_CAPTURE);
if (!ret)
/* Wait until a frame is captured to ISP internal memory */
ret = m5mols_wait_interrupt(sd, REG_INT_CAPTURE, 2000);