]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] smiapp: re-use clamp_t instead of min(..., max(...))
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 10 Aug 2013 17:49:45 +0000 (14:49 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 22 Aug 2013 14:38:09 +0000 (11:38 -0300)
clamp_t does the job to put a variable into the given range.
clamp_t -> clamp as agreed with Andy.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/i2c/smiapp/smiapp-core.c

index 7ac7580f85c9ab6335e90c1a5c379d33571c0395..4d7ba548b93950939dfecabef788c33106e136a6 100644 (file)
@@ -1835,12 +1835,12 @@ static void smiapp_set_compose_scaler(struct v4l2_subdev *subdev,
                * sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN]
                / sensor->limits[SMIAPP_LIMIT_MIN_X_OUTPUT_SIZE];
 
-       a = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],
-               max(a, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN]));
-       b = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],
-               max(b, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN]));
-       max_m = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],
-                   max(max_m, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN]));
+       a = clamp(a, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],
+                 sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX]);
+       b = clamp(b, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],
+                 sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX]);
+       max_m = clamp(max_m, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],
+                     sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX]);
 
        dev_dbg(&client->dev, "scaling: a %d b %d max_m %d\n", a, b, max_m);