From 1002a240ed72f0535f01ca88e0341ccf7c4e0b54 Mon Sep 17 00:00:00 2001 From: Aybuke Ozdemir Date: Tue, 21 Oct 2014 01:39:34 +0300 Subject: [PATCH] staging: media: omap24xx: Use min_t instead of min MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch focuses on fixing the following warning generated by checkpatch.pl for the file tcm825x.c: WARNÄ°NG: min() should probably be min_t(u32, tgt_xclk, TCM825X_XCLK_MAX) The changes were applied using the following coccinelle rule: @@ expression e1, e2; typedef u32; @@ -tgt_xclk = min(e1, (u32)e2); +tgt_xclk = min_t(u32, e1, e2); Signed-off-by: Aybuke Ozdemir Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/omap24xx/tcm825x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/omap24xx/tcm825x.c b/drivers/staging/media/omap24xx/tcm825x.c index 9d9ecf1fc4ae..6a1f47995a17 100644 --- a/drivers/staging/media/omap24xx/tcm825x.c +++ b/drivers/staging/media/omap24xx/tcm825x.c @@ -751,7 +751,7 @@ static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p) (2457 * tgt_fps) / MAX_FPS; tgt_xclk *= 10000; - tgt_xclk = min(tgt_xclk, (u32)TCM825X_XCLK_MAX); + tgt_xclk = min_t(u32, tgt_xclk, TCM825X_XCLK_MAX); tgt_xclk = max(tgt_xclk, (u32)TCM825X_XCLK_MIN); p->u.bt656.clock_curr = tgt_xclk; -- 2.30.2