On 19/04/2021 21:25, Martiros Shakhzadyan wrote:
> Replace centralized exit goto with an immediate exit log and return, in
> order for the log macro to properly display the file line.
>
> Signed-off-by: Martiros Shakhzadyan <vrzh@xxxxxxxx>
> ---
> drivers/staging/media/atomisp/pci/sh_css.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
> index 4d4f030e0fe0..87438b5948ba 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css.c
> +++ b/drivers/staging/media/atomisp/pci/sh_css.c
> @@ -5181,8 +5181,10 @@ 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;
> + if (err) {
> + IA_CSS_LEAVE_ERR_PRIVATE(err);
> + return err;
> + }
> } else {
> memset(&info->s3a_grid, 0, sizeof(info->s3a_grid));
> }
> @@ -5207,7 +5209,6 @@ sh_css_pipe_get_grid_info(struct ia_css_pipe *pipe,
>
> info->vamem_type = IA_CSS_VAMEM_TYPE_2;
>
> -ERR :
> IA_CSS_LEAVE_ERR_PRIVATE(err);
> return err;
> }
>
Hmm, I'm skipping this patch. It doesn't really change anything since
there is only one place where an error can occur, so there is no confusion
about what caused the error.
The patch is not wrong as such, but there is not a good enough reason to
apply it.
When in doubt, do nothing :-)
Regards,
Hans
