Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7be5c289 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: re-use clamp_t instead of min(..., max(...)) 



clamp_t does the job to put a variable into the given range.
clamp_t -> clamp as agreed with Andy.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3300a8fd

drivers/media/i2c/smiapp/smiapp-core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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_SCALER_N_MIN]

		/ sensor->limits[SMIAPP_LIMIT_MIN_X_OUTPUT_SIZE];

		/ sensor->limits[SMIAPP_LIMIT_MIN_X_OUTPUT_SIZE];





	a = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],

	a = clamp(a, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],

		max(a, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN]));

		  sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX]);

	b = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],

	b = clamp(b, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],

		max(b, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN]));

		  sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX]);

	max_m = min(sensor->limits[SMIAPP_LIMIT_SCALER_M_MAX],

	max_m = clamp(max_m, sensor->limits[SMIAPP_LIMIT_SCALER_M_MIN],

		    max(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);

	dev_dbg(&client->dev, "scaling: a %d b %d max_m %d\n", a, b, max_m);