| Message ID | 20200625185017.16493-4-dafna.hirschfeld@collabora.com |
|---|---|
| State | Accepted |
| Commit | a699a4c117eadb39a9041a85240cd7464ffbe8b4 |
| Headers | show |
| Series | [1/4] media: staging: rkisp1: remove two unused fields in uapi struct | expand |
On 6/25/20 3:50 PM, Dafna Hirschfeld wrote: > The two macros RKISP1_CIF_ISP_LSC_{GRAD/SIZE}_TBL_SIZE have > the same value which is the number of sectors in the grads > and size parameters. Therefore there is no need for two > different macros. Replace them with one macro > RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE. Also use the macro > when iterating the arries instead of hardcoded '4'. > > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- > drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c > index 5be57426d940..ea55532ab797 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-params.c > +++ b/drivers/staging/media/rkisp1/rkisp1-params.c > @@ -267,7 +267,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, > RKISP1_CIF_ISP_LSC_CTRL_ENA); > rkisp1_lsc_correct_matrix_config(params, arg); > > - for (i = 0; i < 4; i++) { > + for (i = 0; i < RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE / 2; i++) { > /* program x size tables */ > data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], > arg->x_size_tbl[i * 2 + 1]); > diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > index d8a8e4457aa4..bca2e805c0f5 100644 > --- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > +++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > @@ -82,8 +82,8 @@ > /* > * Lens shade correction > */ > -#define RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE 8 > -#define RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE 8 > +#define RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE 8 > + > /* > * The following matches the tuning process, > * not the max capabilities of the chip. > @@ -279,11 +279,11 @@ struct rkisp1_cif_isp_lsc_config { > __u32 gb_data_tbl[RKISP1_CIF_ISP_LSC_SAMPLES_MAX][RKISP1_CIF_ISP_LSC_SAMPLES_MAX]; > __u32 b_data_tbl[RKISP1_CIF_ISP_LSC_SAMPLES_MAX][RKISP1_CIF_ISP_LSC_SAMPLES_MAX]; > > - __u32 x_grad_tbl[RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE]; > - __u32 y_grad_tbl[RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE]; > + __u32 x_grad_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; > + __u32 y_grad_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; > > - __u32 x_size_tbl[RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE]; > - __u32 y_size_tbl[RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE]; > + __u32 x_size_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; > + __u32 y_size_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; > } __packed; > > /** >
diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 5be57426d940..ea55532ab797 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -267,7 +267,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params, RKISP1_CIF_ISP_LSC_CTRL_ENA); rkisp1_lsc_correct_matrix_config(params, arg); - for (i = 0; i < 4; i++) { + for (i = 0; i < RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE / 2; i++) { /* program x size tables */ data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], arg->x_size_tbl[i * 2 + 1]); diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h index d8a8e4457aa4..bca2e805c0f5 100644 --- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h +++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h @@ -82,8 +82,8 @@ /* * Lens shade correction */ -#define RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE 8 -#define RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE 8 +#define RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE 8 + /* * The following matches the tuning process, * not the max capabilities of the chip. @@ -279,11 +279,11 @@ struct rkisp1_cif_isp_lsc_config { __u32 gb_data_tbl[RKISP1_CIF_ISP_LSC_SAMPLES_MAX][RKISP1_CIF_ISP_LSC_SAMPLES_MAX]; __u32 b_data_tbl[RKISP1_CIF_ISP_LSC_SAMPLES_MAX][RKISP1_CIF_ISP_LSC_SAMPLES_MAX]; - __u32 x_grad_tbl[RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE]; - __u32 y_grad_tbl[RKISP1_CIF_ISP_LSC_GRAD_TBL_SIZE]; + __u32 x_grad_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; + __u32 y_grad_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; - __u32 x_size_tbl[RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE]; - __u32 y_size_tbl[RKISP1_CIF_ISP_LSC_SIZE_TBL_SIZE]; + __u32 x_size_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; + __u32 y_size_tbl[RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE]; } __packed; /**
The two macros RKISP1_CIF_ISP_LSC_{GRAD/SIZE}_TBL_SIZE have the same value which is the number of sectors in the grads and size parameters. Therefore there is no need for two different macros. Replace them with one macro RKISP1_CIF_ISP_LSC_SECTORS_TBL_SIZE. Also use the macro when iterating the arries instead of hardcoded '4'. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)