media: Revert "staging: imgu: Address a compiler warning on alignment"

This reverts commit 5336f19523a3f26e3463ef0a745c046f55e36dad.

The patch being reverted changed the memory layout of struct
ipu3_uapi_acc_param. Revert it, and address the compiler warning issues in
further patches.

Fixes: commit 5336f19523a3 ("media: staging: imgu: Address a compiler warning on alignment")
Reported-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Bingbu Cao <bingbu.cao@intel.com>
Cc: stable@vger.kernel.org # for v5.3 and up
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h
index 1c9c3ba4d518dae30d63e387e0b97b9316dd887e..5f43f631cf62f1c2e031d2607075d0998345bec1 100644 (file)
--- a/drivers/staging/media/ipu3/include/intel-ipu3.h
+++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
@@ -2477,7 +2477,7 @@ struct ipu3_uapi_acc_param {
        struct ipu3_uapi_yuvp1_yds_config yds2 __attribute__((aligned(32)));
        struct ipu3_uapi_yuvp2_tcc_static_config tcc __attribute__((aligned(32)));
        struct ipu3_uapi_anr_config anr;
-       struct ipu3_uapi_awb_fr_config_s awb_fr __attribute__((aligned(32)));
+       struct ipu3_uapi_awb_fr_config_s awb_fr;
        struct ipu3_uapi_ae_config ae;
        struct ipu3_uapi_af_config_s af;
        struct ipu3_uapi_awb_config awb;