OSDN Git Service

media: atomisp: remove useless returns
authorPavel Skripkin <paskripkin@gmail.com>
Sat, 8 May 2021 13:17:27 +0000 (15:17 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 22 Jul 2021 12:01:55 +0000 (14:01 +0200)
Returns are not useful at the end of void functions,
they can simply be removed.

Link: https://lore.kernel.org/linux-media/23a6984ddfb15ba38f6983381bb6fdaef3edd7d8.1620479607.git.paskripkin@gmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c

index 76414b6..8e085dd 100644 (file)
@@ -174,8 +174,6 @@ void input_system_get_state(
                ctrl_unit_get_state(ID, sub_id,
                                    &state->ctrl_unit_state[sub_id - CTRL_UNIT0_ID]);
        }
-
-       return;
 }
 
 void receiver_get_state(
@@ -246,8 +244,6 @@ void receiver_get_state(
                               _HRT_CSS_RECEIVER_BE_IRQ_STATUS_REG_IDX);
        state->be_irq_clear = receiver_reg_load(ID,
                                                _HRT_CSS_RECEIVER_BE_IRQ_CLEAR_REG_IDX);
-
-       return;
 }
 
 bool is_mipi_format_yuv420(
@@ -310,8 +306,6 @@ void receiver_set_compression(
        reg = ((field_id < 6) ? (val << (field_id * 5)) : (val << ((
                    field_id - 6) * 5)));
        receiver_reg_store(ID, addr, reg);
-
-       return;
 }
 
 void receiver_port_enable(
@@ -330,7 +324,6 @@ void receiver_port_enable(
 
        receiver_port_reg_store(ID, port_ID,
                                _HRT_CSS_RECEIVER_DEVICE_READY_REG_IDX, reg);
-       return;
 }
 
 bool is_receiver_port_enabled(
@@ -349,7 +342,6 @@ void receiver_irq_enable(
 {
        receiver_port_reg_store(ID,
                                port_ID, _HRT_CSS_RECEIVER_IRQ_ENABLE_REG_IDX, irq_info);
-       return;
 }
 
 rx_irq_info_t receiver_get_irq_info(
@@ -367,7 +359,6 @@ void receiver_irq_clear(
 {
        receiver_port_reg_store(ID,
                                port_ID, _HRT_CSS_RECEIVER_IRQ_STATUS_REG_IDX, irq_info);
-       return;
 }
 
 static inline void capture_unit_get_state(
@@ -428,8 +419,6 @@ static inline void capture_unit_get_state(
        state->FSM_State_Info = input_system_sub_system_reg_load(ID,
                                sub_id,
                                CAPT_FSM_STATE_INFO_REG_ID);
-
-       return;
 }
 
 static inline void acquisition_unit_get_state(
@@ -478,8 +467,6 @@ static inline void acquisition_unit_get_state(
        state->Int_Cntr_Info = input_system_sub_system_reg_load(ID,
                               sub_id,
                               ACQ_INT_CNTR_INFO_REG_ID);
-
-       return;
 }
 
 static inline void ctrl_unit_get_state(
@@ -561,8 +548,6 @@ static inline void ctrl_unit_get_state(
        state->capt_reserve_one_mem_region = input_system_sub_system_reg_load(ID,
                                             sub_id,
                                             ISYS_CTRL_CAPT_RESERVE_ONE_MEM_REGION_REG_ID);
-
-       return;
 }
 
 static inline void mipi_port_get_state(
@@ -597,8 +582,6 @@ static inline void mipi_port_get_state(
                state->lane_sync_count[i] = (uint8_t)((state->sync_count) >> (i * 8));
                state->lane_rx_count[i] = (uint8_t)((state->rx_count) >> (i * 8));
        }
-
-       return;
 }
 
 static inline void rx_channel_get_state(
@@ -652,8 +635,6 @@ static inline void rx_channel_get_state(
                state->comp[i] = (mipi_compressor_t)(val & 0x07);
                state->pred[i] = (mipi_predictor_t)((val & 0x18) >> 3);
        }
-
-       return;
 }
 
 // MW: "2400" in the name is not good, but this is to avoid a naming conflict
@@ -672,8 +653,6 @@ static void receiver_rst(
        }
 
        // AM: Additional actions for stopping receiver?
-
-       return;
 }
 
 //Single function to reset all the devices mapped via GP_DEVICE.
@@ -722,8 +701,6 @@ static void gp_device_rst(const gp_device_ID_t              ID)
        //      gp_device_reg_store(ID, _REG_GP_SYNCGEN_FRAME_CNT_ADDR, ZERO);
        gp_device_reg_store(ID, _REG_GP_SOFT_RESET_ADDR,
                            ZERO); // AM: Maybe this soft reset is not safe.
-
-       return;
 }
 
 static void input_selector_cfg_for_sensor(const gp_device_ID_t ID)
@@ -740,8 +717,6 @@ static void input_selector_cfg_for_sensor(const gp_device_ID_t ID)
        gp_device_reg_store(ID, _REG_GP_ISEL_SBAND_SEL_ADDR, ZERO);
        gp_device_reg_store(ID, _REG_GP_ISEL_SYNC_SEL_ADDR, ZERO);
        gp_device_reg_store(ID, _REG_GP_SOFT_RESET_ADDR, ZERO);
-
-       return;
 }
 
 static void input_switch_rst(const gp_device_ID_t ID)
@@ -760,8 +735,6 @@ static void input_switch_rst(const gp_device_ID_t ID)
        gp_device_reg_store(ID,
                            _REG_GP_IFMT_input_switch_fsync_lut,
                            ZERO);
-
-       return;
 }
 
 static void input_switch_cfg(
@@ -786,8 +759,6 @@ static void input_switch_cfg(
        gp_device_reg_store(ID,
                            _REG_GP_IFMT_input_switch_fsync_lut,
                            cfg->vsync_data_reg);
-
-       return;
 }
 
 static void input_system_network_rst(const input_system_ID_t ID)
@@ -843,8 +814,6 @@ static void input_system_network_rst(const input_system_ID_t ID)
                                                  ISYS_CTRL_INIT_REG_ID,
                                                  1U); //AM: Is there any named constant?
        }
-
-       return;
 }
 
 // Function that resets current configuration.
@@ -1072,8 +1041,6 @@ static void capture_unit_configure(
                                          sub_id,
                                          CAPT_NUM_MEM_REGIONS_REG_ID,
                                          cfg->nof_mem_regs);
-
-       return;
 }
 
 static void acquisition_unit_configure(
@@ -1097,8 +1064,6 @@ static void acquisition_unit_configure(
                                          sub_id,
                                          ACQ_MEM_REGION_SIZE_REG_ID,
                                          cfg->mem_reg_size);
-
-       return;
 }
 
 static void ctrl_unit_configure(
@@ -1165,7 +1130,6 @@ static void ctrl_unit_configure(
                                          sub_id,
                                          ISYS_CTRL_CAPT_RESERVE_ONE_MEM_REGION_REG_ID,
                                          0);
-       return;
 }
 
 static void input_system_network_configure(
@@ -1223,8 +1187,6 @@ static void input_system_network_configure(
                                    sub_id,
                                    &cfg->ctrl_unit_cfg[sub_id - CTRL_UNIT0_ID]);
        }
-
-       return;
 }
 
 static input_system_err_t configuration_to_registers(void)