mirror of
https://github.com/torvalds/linux.git
synced 2026-07-29 02:31:27 +02:00
staging: media: atomisp: Fix function indentation and braces
Fix parameter indentation for functions and move opening braces onto new
line. Fix checkpatch.pl errors:
ERROR: open brace '{' following function definitions go on the next line
Signed-off-by: Matt Wardle <matt@mattwardle.net>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
parent
f3c450f5f1
commit
2785424faf
|
|
@ -258,12 +258,11 @@ convert_allocate_dvs_6axis_config(
|
|||
return me;
|
||||
}
|
||||
|
||||
int
|
||||
store_dvs_6axis_config(
|
||||
const struct ia_css_dvs_6axis_config *dvs_6axis_config,
|
||||
const struct ia_css_binary *binary,
|
||||
const struct ia_css_frame_info *dvs_in_frame_info,
|
||||
ia_css_ptr ddr_addr_y) {
|
||||
int store_dvs_6axis_config(const struct ia_css_dvs_6axis_config *dvs_6axis_config,
|
||||
const struct ia_css_binary *binary,
|
||||
const struct ia_css_frame_info *dvs_in_frame_info,
|
||||
ia_css_ptr ddr_addr_y)
|
||||
{
|
||||
struct ia_css_host_data *me;
|
||||
|
||||
assert(dvs_6axis_config);
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ static const struct ia_css_raw_configuration default_config = {
|
|||
};
|
||||
|
||||
/* MW: These areMIPI / ISYS properties, not camera function properties */
|
||||
static enum sh_stream_format
|
||||
css2isp_stream_format(enum atomisp_input_format from) {
|
||||
static enum sh_stream_format css2isp_stream_format(enum atomisp_input_format from)
|
||||
{
|
||||
switch (from)
|
||||
{
|
||||
case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
|
||||
|
|
|
|||
|
|
@ -164,10 +164,9 @@ void ia_css_sdis2_clear_coefficients(
|
|||
dvs2_coefs->ver_coefs.even_imag = NULL;
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_get_dvs2_statistics(
|
||||
struct ia_css_dvs2_statistics *host_stats,
|
||||
const struct ia_css_isp_dvs_statistics *isp_stats) {
|
||||
int ia_css_get_dvs2_statistics(struct ia_css_dvs2_statistics *host_stats,
|
||||
const struct ia_css_isp_dvs_statistics *isp_stats)
|
||||
{
|
||||
struct ia_css_isp_dvs_statistics_map *map;
|
||||
int ret = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,11 +45,10 @@ int ia_css_vf_config(struct sh_css_isp_vf_isp_config *to,
|
|||
* to the requested viewfinder resolution on the upper side. The output cannot
|
||||
* be smaller than the requested viewfinder resolution.
|
||||
*/
|
||||
int
|
||||
sh_css_vf_downscale_log2(
|
||||
const struct ia_css_frame_info *out_info,
|
||||
const struct ia_css_frame_info *vf_info,
|
||||
unsigned int *downscale_log2) {
|
||||
int sh_css_vf_downscale_log2(const struct ia_css_frame_info *out_info,
|
||||
const struct ia_css_frame_info *vf_info,
|
||||
unsigned int *downscale_log2)
|
||||
{
|
||||
unsigned int ds_log2 = 0;
|
||||
unsigned int out_width;
|
||||
|
||||
|
|
@ -80,13 +79,12 @@ sh_css_vf_downscale_log2(
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
configure_kernel(
|
||||
const struct ia_css_binary_info *info,
|
||||
const struct ia_css_frame_info *out_info,
|
||||
const struct ia_css_frame_info *vf_info,
|
||||
unsigned int *downscale_log2,
|
||||
struct ia_css_vf_configuration *config) {
|
||||
static int configure_kernel(const struct ia_css_binary_info *info,
|
||||
const struct ia_css_frame_info *out_info,
|
||||
const struct ia_css_frame_info *vf_info,
|
||||
unsigned int *downscale_log2,
|
||||
struct ia_css_vf_configuration *config)
|
||||
{
|
||||
int err;
|
||||
unsigned int vf_log_ds = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -347,10 +347,10 @@ ia_css_binary_dvs_stat_grid_info(
|
|||
return;
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_binary_3a_grid_info(const struct ia_css_binary *binary,
|
||||
struct ia_css_grid_info *info,
|
||||
struct ia_css_pipe *pipe) {
|
||||
int ia_css_binary_3a_grid_info(const struct ia_css_binary *binary,
|
||||
struct ia_css_grid_info *info,
|
||||
struct ia_css_pipe *pipe)
|
||||
{
|
||||
struct ia_css_3a_grid_info *s3a_info;
|
||||
int err = 0;
|
||||
|
||||
|
|
@ -439,9 +439,9 @@ supports_bds_factor(u32 supported_factors,
|
|||
return ((supported_factors & PACK_BDS_FACTOR(bds_factor)) != 0);
|
||||
}
|
||||
|
||||
static int
|
||||
binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
|
||||
bool *binary_found) {
|
||||
static int binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
|
||||
bool *binary_found)
|
||||
{
|
||||
const unsigned char *blob = sh_css_blob_info[i].blob;
|
||||
unsigned int size = sh_css_blob_info[i].header.blob.size;
|
||||
|
||||
|
|
@ -464,8 +464,8 @@ binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
|
|||
/* When binaries are put at the beginning, they will only
|
||||
* be selected if no other primary matches.
|
||||
*/
|
||||
int
|
||||
ia_css_binary_init_infos(void) {
|
||||
int ia_css_binary_init_infos(void)
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int num_of_isp_binaries = sh_css_num_binaries - NUM_OF_SPS - NUM_OF_BLS;
|
||||
|
||||
|
|
@ -497,8 +497,8 @@ ia_css_binary_init_infos(void) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_binary_uninit(void) {
|
||||
int ia_css_binary_uninit(void)
|
||||
{
|
||||
unsigned int i;
|
||||
struct ia_css_binary_xinfo *b;
|
||||
|
||||
|
|
@ -625,19 +625,19 @@ binary_in_frame_padded_width(int in_frame_width,
|
|||
return rval;
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
|
||||
bool online,
|
||||
bool two_ppc,
|
||||
enum atomisp_input_format stream_format,
|
||||
const struct ia_css_frame_info *in_info, /* can be NULL */
|
||||
const struct ia_css_frame_info *bds_out_info, /* can be NULL */
|
||||
const struct ia_css_frame_info *out_info[], /* can be NULL */
|
||||
const struct ia_css_frame_info *vf_info, /* can be NULL */
|
||||
struct ia_css_binary *binary,
|
||||
struct ia_css_resolution *dvs_env,
|
||||
int stream_config_left_padding,
|
||||
bool accelerator) {
|
||||
int ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
|
||||
bool online,
|
||||
bool two_ppc,
|
||||
enum atomisp_input_format stream_format,
|
||||
const struct ia_css_frame_info *in_info, /* can be NULL */
|
||||
const struct ia_css_frame_info *bds_out_info, /* can be NULL */
|
||||
const struct ia_css_frame_info *out_info[], /* can be NULL */
|
||||
const struct ia_css_frame_info *vf_info, /* can be NULL */
|
||||
struct ia_css_binary *binary,
|
||||
struct ia_css_resolution *dvs_env,
|
||||
int stream_config_left_padding,
|
||||
bool accelerator)
|
||||
{
|
||||
const struct ia_css_binary_info *info = &xinfo->sp;
|
||||
unsigned int dvs_env_width = 0,
|
||||
dvs_env_height = 0,
|
||||
|
|
|
|||
|
|
@ -93,11 +93,10 @@ ia_css_init_memory_interface(
|
|||
}
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_isp_param_allocate_isp_parameters(
|
||||
struct ia_css_isp_param_host_segments *mem_params,
|
||||
struct ia_css_isp_param_css_segments *css_params,
|
||||
const struct ia_css_isp_param_isp_segments *mem_initializers) {
|
||||
int ia_css_isp_param_allocate_isp_parameters(struct ia_css_isp_param_host_segments *mem_params,
|
||||
struct ia_css_isp_param_css_segments *css_params,
|
||||
const struct ia_css_isp_param_isp_segments *mem_initializers)
|
||||
{
|
||||
int err = 0;
|
||||
unsigned int mem, pclass;
|
||||
|
||||
|
|
@ -171,11 +170,10 @@ ia_css_isp_param_load_fw_params(
|
|||
}
|
||||
}
|
||||
|
||||
int
|
||||
ia_css_isp_param_copy_isp_mem_if_to_ddr(
|
||||
struct ia_css_isp_param_css_segments *ddr,
|
||||
const struct ia_css_isp_param_host_segments *host,
|
||||
enum ia_css_param_class pclass) {
|
||||
int ia_css_isp_param_copy_isp_mem_if_to_ddr(struct ia_css_isp_param_css_segments *ddr,
|
||||
const struct ia_css_isp_param_host_segments *host,
|
||||
enum ia_css_param_class pclass)
|
||||
{
|
||||
unsigned int mem;
|
||||
|
||||
for (mem = 0; mem < N_IA_CSS_ISP_MEMORIES; mem++)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user