From: Aybuke Ozdemir Date: Mon, 20 Oct 2014 22:39:34 +0000 (+0300) Subject: staging: media: omap24xx: Use min_t instead of min X-Git-Tag: firefly_0821_release~176^2~2665^2~1039 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1002a240ed72f0535f01ca88e0341ccf7c4e0b54;p=firefly-linux-kernel-4.4.55.git staging: media: omap24xx: Use min_t instead of min 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 --- 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;