* [PATCH 0/4] staging: media: atomisp: Fix minor issues in
@ 2021-05-08 23:56 Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 1/4] staging: media: atomisp: Resolve goto style issue in sh_css.c Martiros Shakhzadyan
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Martiros Shakhzadyan @ 2021-05-08 23:56 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Martiros Shakhzadyan, Sakari Ailus, Hans Verkuil, linux-media
The following series of patches resolve some style and other minor
issues in sh_css.c
Martiros Shakhzadyan (4):
staging: media: atomisp: Resolve goto style issue in sh_css.c
staging: media: atomisp: Remove unnecessary parens in sh_css.c
staging: media: atomisp: Use kcalloc instead of kzalloc with multiply
in sh_css.c
staging: media: atomisp: Fix line continuation style issue in sh_css.c
drivers/staging/media/atomisp/pci/sh_css.c | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] staging: media: atomisp: Resolve goto style issue in sh_css.c
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
@ 2021-05-08 23:56 ` Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 2/4] staging: media: atomisp: Remove unnecessary parens " Martiros Shakhzadyan
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Martiros Shakhzadyan @ 2021-05-08 23:56 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Martiros Shakhzadyan, Sakari Ailus, Hans Verkuil, linux-media
Change the goto label to lower case.
Remove a space in the goto label.
Signed-off-by: Martiros Shakhzadyan <vrzh@vrzh.net>
---
drivers/staging/media/atomisp/pci/sh_css.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index d26b1301eeb7..53c1001b807b 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -5170,7 +5170,7 @@ sh_css_pipe_get_grid_info(struct ia_css_pipe *pipe,
if (binary) {
err = ia_css_binary_3a_grid_info(binary, info, pipe);
if (err)
- goto ERR;
+ goto err;
} else {
memset(&info->s3a_grid, 0, sizeof(info->s3a_grid));
}
@@ -5195,7 +5195,7 @@ sh_css_pipe_get_grid_info(struct ia_css_pipe *pipe,
info->vamem_type = IA_CSS_VAMEM_TYPE_2;
-ERR :
+err:
IA_CSS_LEAVE_ERR_PRIVATE(err);
return err;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] staging: media: atomisp: Remove unnecessary parens in sh_css.c
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 1/4] staging: media: atomisp: Resolve goto style issue in sh_css.c Martiros Shakhzadyan
@ 2021-05-08 23:56 ` Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 3/4] staging: media: atomisp: Use kcalloc instead of kzalloc with multiply " Martiros Shakhzadyan
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Martiros Shakhzadyan @ 2021-05-08 23:56 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Martiros Shakhzadyan, Sakari Ailus, Hans Verkuil, linux-media
Remove unnecessary parenthesis.
Signed-off-by: Martiros Shakhzadyan <vrzh@vrzh.net>
---
drivers/staging/media/atomisp/pci/sh_css.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 53c1001b807b..51fe939a8958 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -10162,7 +10162,7 @@ ia_css_stop_sp(void)
timeout--;
udelay(1);
}
- if ((ia_css_spctrl_get_state(SP0_ID) != IA_CSS_SP_SW_TERMINATED))
+ if (ia_css_spctrl_get_state(SP0_ID) != IA_CSS_SP_SW_TERMINATED)
IA_CSS_WARNING("SP has not terminated (SW)");
if (timeout == 0) {
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] staging: media: atomisp: Use kcalloc instead of kzalloc with multiply in sh_css.c
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 1/4] staging: media: atomisp: Resolve goto style issue in sh_css.c Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 2/4] staging: media: atomisp: Remove unnecessary parens " Martiros Shakhzadyan
@ 2021-05-08 23:56 ` Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 4/4] staging: media: atomisp: Fix line continuation style issue " Martiros Shakhzadyan
2021-05-25 16:15 ` [PATCH 0/4] staging: media: atomisp: Fix minor issues in Sakari Ailus
4 siblings, 0 replies; 6+ messages in thread
From: Martiros Shakhzadyan @ 2021-05-08 23:56 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Martiros Shakhzadyan, Sakari Ailus, Hans Verkuil, linux-media
Use kcalloc instead of kzalloc with multiplication.
Signed-off-by: Martiros Shakhzadyan <vrzh@vrzh.net>
---
drivers/staging/media/atomisp/pci/sh_css.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 51fe939a8958..b8dd817616e8 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -5328,14 +5328,15 @@ static int load_video_binaries(struct ia_css_pipe *pipe)
if (err)
return err;
mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
- mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
- sizeof(struct ia_css_binary), GFP_KERNEL);
+ mycs->yuv_scaler_binary = kcalloc(cas_scaler_descr.num_stage,
+ sizeof(struct ia_css_binary),
+ GFP_KERNEL);
if (!mycs->yuv_scaler_binary) {
err = -ENOMEM;
return err;
}
- mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage
- * sizeof(bool), GFP_KERNEL);
+ mycs->is_output_stage = kcalloc(cas_scaler_descr.num_stage,
+ sizeof(bool), GFP_KERNEL);
if (!mycs->is_output_stage) {
err = -ENOMEM;
return err;
@@ -5938,14 +5939,15 @@ static int load_primary_binaries(
return err;
}
mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
- mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
- sizeof(struct ia_css_binary), GFP_KERNEL);
+ mycs->yuv_scaler_binary = kcalloc(cas_scaler_descr.num_stage,
+ sizeof(struct ia_css_binary),
+ GFP_KERNEL);
if (!mycs->yuv_scaler_binary) {
err = -ENOMEM;
IA_CSS_LEAVE_ERR_PRIVATE(err);
return err;
}
- mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage *
+ mycs->is_output_stage = kcalloc(cas_scaler_descr.num_stage,
sizeof(bool), GFP_KERNEL);
if (!mycs->is_output_stage) {
err = -ENOMEM;
@@ -6989,14 +6991,14 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
goto ERR;
mycs->num_output = cas_scaler_descr.num_output_stage;
mycs->num_yuv_scaler = cas_scaler_descr.num_stage;
- mycs->yuv_scaler_binary = kzalloc(cas_scaler_descr.num_stage *
+ mycs->yuv_scaler_binary = kcalloc(cas_scaler_descr.num_stage,
sizeof(struct ia_css_binary),
GFP_KERNEL);
if (!mycs->yuv_scaler_binary) {
err = -ENOMEM;
goto ERR;
}
- mycs->is_output_stage = kzalloc(cas_scaler_descr.num_stage *
+ mycs->is_output_stage = kcalloc(cas_scaler_descr.num_stage,
sizeof(bool), GFP_KERNEL);
if (!mycs->is_output_stage) {
err = -ENOMEM;
@@ -7097,7 +7099,7 @@ load_yuvpp_binaries(struct ia_css_pipe *pipe)
mycs->num_vf_pp = 1;
}
- mycs->vf_pp_binary = kzalloc(mycs->num_vf_pp *
+ mycs->vf_pp_binary = kcalloc(mycs->num_vf_pp,
sizeof(struct ia_css_binary),
GFP_KERNEL);
if (!mycs->vf_pp_binary) {
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] staging: media: atomisp: Fix line continuation style issue in sh_css.c
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
` (2 preceding siblings ...)
2021-05-08 23:56 ` [PATCH 3/4] staging: media: atomisp: Use kcalloc instead of kzalloc with multiply " Martiros Shakhzadyan
@ 2021-05-08 23:56 ` Martiros Shakhzadyan
2021-05-25 16:15 ` [PATCH 0/4] staging: media: atomisp: Fix minor issues in Sakari Ailus
4 siblings, 0 replies; 6+ messages in thread
From: Martiros Shakhzadyan @ 2021-05-08 23:56 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Martiros Shakhzadyan, Sakari Ailus, Hans Verkuil, linux-media
Fix logical continuation style issue and adjacent line splits.
Signed-off-by: Martiros Shakhzadyan <vrzh@vrzh.net>
---
drivers/staging/media/atomisp/pci/sh_css.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index b8dd817616e8..5dac4a506b00 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -3224,24 +3224,22 @@ init_vf_frameinfo_defaults(struct ia_css_pipe *pipe,
#ifdef ISP2401
static unsigned int
-get_crop_lines_for_bayer_order(
- const struct ia_css_stream_config *config)
+get_crop_lines_for_bayer_order(const struct ia_css_stream_config *config)
{
assert(config);
- if ((config->input_config.bayer_order == IA_CSS_BAYER_ORDER_BGGR)
- || (config->input_config.bayer_order == IA_CSS_BAYER_ORDER_GBRG))
+ if ((config->input_config.bayer_order == IA_CSS_BAYER_ORDER_BGGR) ||
+ (config->input_config.bayer_order == IA_CSS_BAYER_ORDER_GBRG))
return 1;
return 0;
}
static unsigned int
-get_crop_columns_for_bayer_order(
- const struct ia_css_stream_config *config)
+get_crop_columns_for_bayer_order(const struct ia_css_stream_config *config)
{
assert(config);
- if ((config->input_config.bayer_order == IA_CSS_BAYER_ORDER_RGGB)
- || (config->input_config.bayer_order == IA_CSS_BAYER_ORDER_GBRG))
+ if ((config->input_config.bayer_order == IA_CSS_BAYER_ORDER_RGGB) ||
+ (config->input_config.bayer_order == IA_CSS_BAYER_ORDER_GBRG))
return 1;
return 0;
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/4] staging: media: atomisp: Fix minor issues in
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
` (3 preceding siblings ...)
2021-05-08 23:56 ` [PATCH 4/4] staging: media: atomisp: Fix line continuation style issue " Martiros Shakhzadyan
@ 2021-05-25 16:15 ` Sakari Ailus
4 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2021-05-25 16:15 UTC (permalink / raw)
To: Martiros Shakhzadyan; +Cc: Mauro Carvalho Chehab, Hans Verkuil, linux-media
On Sat, May 08, 2021 at 07:56:18PM -0400, Martiros Shakhzadyan wrote:
> The following series of patches resolve some style and other minor
> issues in sh_css.c
>
> Martiros Shakhzadyan (4):
> staging: media: atomisp: Resolve goto style issue in sh_css.c
> staging: media: atomisp: Remove unnecessary parens in sh_css.c
> staging: media: atomisp: Use kcalloc instead of kzalloc with multiply
> in sh_css.c
> staging: media: atomisp: Fix line continuation style issue in sh_css.c
>
> drivers/staging/media/atomisp/pci/sh_css.c | 42 +++++++++++-----------
> 1 file changed, 21 insertions(+), 21 deletions(-)
Thanks!
For the set:
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
--
Sakari Ailus
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-25 16:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-08 23:56 [PATCH 0/4] staging: media: atomisp: Fix minor issues in Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 1/4] staging: media: atomisp: Resolve goto style issue in sh_css.c Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 2/4] staging: media: atomisp: Remove unnecessary parens " Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 3/4] staging: media: atomisp: Use kcalloc instead of kzalloc with multiply " Martiros Shakhzadyan
2021-05-08 23:56 ` [PATCH 4/4] staging: media: atomisp: Fix line continuation style issue " Martiros Shakhzadyan
2021-05-25 16:15 ` [PATCH 0/4] staging: media: atomisp: Fix minor issues in Sakari Ailus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).