From 375d5f9395fa9830511d81e6ff1c0e67420963bc Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Tue, 21 Feb 2012 13:34:32 +0200 Subject: [PATCH] atomisp: use min_t and max_t instead of direct casting BZ: 24615 There are few places where max and min macros used as follows min(a, ()b) It could be easily changed to min_t(, a, b) Change-Id: I7717b16cc9cc79e1da005e10bc8853d78498efc3 Signed-off-by: Andy Shevchenko Reviewed-on: http://android.intel.com:8080/36100 Reviewed-by: Shevchenko, Andriy Reviewed-by: Cohen, David A Reviewed-by: Wang, Wen W Tested-by: Koski, Anttu Reviewed-by: buildbot Tested-by: buildbot --- drivers/media/video/atomisp/atomisp_cmd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c index aed97c5..da2ce62 100644 --- a/drivers/media/video/atomisp/atomisp_cmd.c +++ b/drivers/media/video/atomisp/atomisp_cmd.c @@ -2763,11 +2763,11 @@ done: } /* app vs isp */ - out_width = min(out_width, (u32)ATOM_ISP_MAX_WIDTH); - out_height = min(out_height, (u32)ATOM_ISP_MAX_HEIGHT); + out_width = min_t(u32, out_width, ATOM_ISP_MAX_WIDTH); + out_height = min_t(u32, out_height, ATOM_ISP_MAX_HEIGHT); - out_width = max(out_width, (u32)ATOM_ISP_MIN_WIDTH); - out_height = max(out_height, (u32)ATOM_ISP_MIN_HEIGHT); + out_width = max_t(u32, out_width, ATOM_ISP_MIN_WIDTH); + out_height = max_t(u32, out_height, ATOM_ISP_MIN_HEIGHT); out_width = out_width - out_width % ATOM_ISP_STEP_WIDTH; out_height = out_height - out_height % ATOM_ISP_STEP_HEIGHT; @@ -3326,11 +3326,11 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) width -= padding_w; height -= padding_h; /* app vs isp */ - width = min(width, (u32)ATOM_ISP_MAX_WIDTH); - height = min(height, (u32)ATOM_ISP_MAX_HEIGHT); + width = min_t(u32, width, ATOM_ISP_MAX_WIDTH); + height = min_t(u32, height, ATOM_ISP_MAX_HEIGHT); - width = max(width, (u32)ATOM_ISP_MIN_WIDTH); - height = max(height, (u32)ATOM_ISP_MIN_HEIGHT); + width = max_t(u32, width, ATOM_ISP_MIN_WIDTH); + height = max_t(u32, height, ATOM_ISP_MIN_HEIGHT); width = width - width % ATOM_ISP_STEP_WIDTH; height = height - height % ATOM_ISP_STEP_HEIGHT; -- 2.7.4