media: imx283: drop CENTERED_RECTANGLE due to clang failure

The CENTERED_RECTANGLE define fails to compile on clang and old gcc
versions. Just drop it and fill in the crop rectangles explicitly.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/media/i2c/imx283.c b/drivers/media/i2c/imx283.c
index 6428eb5394a956393f4228f220a6872f26888f52..8490618c507150437c165c661a182895760adb18 100644 (file)
--- a/drivers/media/i2c/imx283.c
+++ b/drivers/media/i2c/imx283.c
@@ -407,14 +407,6 @@ static const struct imx283_reg_list link_freq_reglist[] = {
        },
 };
 
-#define CENTERED_RECTANGLE(rect, _width, _height)                      \
-       {                                                               \
-               .left = rect.left + ((rect.width - (_width)) / 2),      \
-               .top = rect.top + ((rect.height - (_height)) / 2),      \
-               .width = (_width),                                      \
-               .height = (_height),                                    \
-       }
-
 /* Mode configs */
 static const struct imx283_mode supported_modes_12bit[] = {
        {
@@ -440,7 +432,12 @@ static const struct imx283_mode supported_modes_12bit[] = {
                .min_shr = 11,
                .horizontal_ob = 96,
                .vertical_ob = 16,
-               .crop = CENTERED_RECTANGLE(imx283_active_area, 5472, 3648),
+               .crop = {
+                       .top = 40,
+                       .left = 108,
+                       .width = 5472,
+                       .height = 3648,
+               },
        },
        {
                /*
@@ -468,7 +465,12 @@ static const struct imx283_mode supported_modes_12bit[] = {
                .horizontal_ob = 48,
                .vertical_ob = 4,
 
-               .crop = CENTERED_RECTANGLE(imx283_active_area, 5472, 3648),
+               .crop = {
+                       .top = 40,
+                       .left = 108,
+                       .width = 5472,
+                       .height = 3648,
+               },
        },
 };
 
@@ -489,7 +491,12 @@ static const struct imx283_mode supported_modes_10bit[] = {
                .min_shr = 10,
                .horizontal_ob = 96,
                .vertical_ob = 16,
-               .crop = CENTERED_RECTANGLE(imx283_active_area, 5472, 3648),
+               .crop = {
+                       .top = 40,
+                       .left = 108,
+                       .width = 5472,
+                       .height = 3648,
+               },
        },
 };