Commit 874da1fd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: add return codes for pipeline config functions 



Those functions can internally break, but, as they don't return
errors, internally there are some assert() calls, which is bad,
as it hangs the driver.

So, add return codes there, in preparation for removing such
assert() calls.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f8852049

drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c

+4 −5
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ ia_css_crop_encode( 
	to->crop_pos = from->crop_pos;

}



void

ia_css_crop_config(

    struct sh_css_isp_crop_isp_config *to,

int ia_css_crop_config(struct sh_css_isp_crop_isp_config *to,

		       const struct ia_css_crop_configuration *from,

		       unsigned int size)

{
@@ -50,6 +48,7 @@ ia_css_crop_config( 


	/* Assume divisiblity here, may need to generalize to fixed point. */

	assert(elems_a % to->port_b.elems == 0);

	return 0;

}



int ia_css_crop_configure(const struct ia_css_binary     *binary,

drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h

+3 −5
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ ia_css_crop_encode( 
    const struct ia_css_crop_config *from,

    unsigned int size);



void

ia_css_crop_config(

    struct sh_css_isp_crop_isp_config      *to,

int ia_css_crop_config(struct sh_css_isp_crop_isp_config      *to,

		       const struct ia_css_crop_configuration *from,

		       unsigned int size);

drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c

+4 −5
Original line number Diff line number Diff line
@@ -51,9 +51,7 @@ ia_css_fpn_dump( 
			    "fpn_enabled", fpn->enabled);

}



void

ia_css_fpn_config(

    struct sh_css_isp_fpn_isp_config *to,

int ia_css_fpn_config(struct sh_css_isp_fpn_isp_config *to,

		      const struct ia_css_fpn_configuration *from,

		      unsigned int size)

{
@@ -65,6 +63,7 @@ ia_css_fpn_config( 


	/* Assume divisiblity here, may need to generalize to fixed point. */

	assert(elems_a % to->port_b.elems == 0);

	return 0;

}



int ia_css_fpn_configure(const struct ia_css_binary     *binary,

drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h

+3 −5
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ ia_css_fpn_dump( 
    const struct sh_css_isp_fpn_params *fpn,

    unsigned int level);



void

ia_css_fpn_config(

    struct sh_css_isp_fpn_isp_config      *to,

int ia_css_fpn_config(struct sh_css_isp_fpn_isp_config      *to,

		      const struct ia_css_fpn_configuration *from,

		      unsigned int size);

drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c

+3 −4
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
#include "ia_css_isp_params.h"

#include "ia_css_frame.h"



void

ia_css_bayer_io_config(

    const struct ia_css_binary      *binary,

int ia_css_bayer_io_config(const struct ia_css_binary      *binary,

			   const struct sh_css_binary_args *args)

{

	const struct ia_css_frame *in_frame = args->in_frame;
@@ -91,4 +89,5 @@ ia_css_bayer_io_config( 
				    "ia_css_bayer_io_config() put part leave:\n");

#endif

	}

	return 0;

}