Skip to contentSkip to conversation

staging: media: atomisp: pci: Remove unnecessary variable used to store return value

PATCH In review Georgiana Rodica Chelu 1 participant 2 messages Mar 7, 2017

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: media: atomisp: pci: Remove unnecessary variable used to store return value

Remove the local variables used to store the return value because their initial value does not change during the function execution.

---
 .../media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c   | 4 +---
 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c      | 4 +---
 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c        | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c +1 -3
index 239ef31..2ed5162 100644
@@ -105,8 +105,6 @@ input_system_error_t ia_css_isys_init(void)
 #elif defined(USE_INPUT_SYSTEM_VERSION_2401)
 input_system_error_t ia_css_isys_init(void)
 {
-	input_system_error_t error = INPUT_SYSTEM_ERR_NO_ERROR;
-
 	ia_css_isys_csi_rx_lut_rmgr_init();
 	ia_css_isys_ibuf_rmgr_init();
 	ia_css_isys_dma_channel_rmgr_init();
@@ -120,7 +118,7 @@ input_system_error_t ia_css_isys_init(void)
 	isys_irqc_status_enable(ISYS_IRQ1_ID);
 	isys_irqc_status_enable(ISYS_IRQ2_ID);
 
-	return error;
+	return INPUT_SYSTEM_ERR_NO_ERROR;
 }
 #endif
 
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c +1 -3
index b251ba4..4a7a603 100644
@@ -37,12 +37,10 @@ enum ia_css_err
 ia_css_mipi_frame_specify(const unsigned int size_mem_words,
 				const bool contiguous)
 {
-	enum ia_css_err err = IA_CSS_SUCCESS;
-
 	my_css.size_mem_words = size_mem_words;
 	(void)contiguous;
 
-	return err;
+	return IA_CSS_SUCCESS;
 }
 
 #ifdef ISP2401
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +1 -2
index 00b2d16..9caf0b6 100644
@@ -825,7 +825,6 @@ configure_isp_from_args(
 	bool two_ppc,
 	bool deinterleaved)
 {
-	enum ia_css_err err = IA_CSS_SUCCESS;
 #ifdef ISP2401
 	struct ia_css_pipe *pipe = find_pipe_by_num(pipeline->pipe_num);
 	const struct ia_css_resolution *res;
@@ -853,7 +852,7 @@ configure_isp_from_args(
 	/* Remove support for TNR2 once TNR3 fully integrated */
 	ia_css_tnr3_configure(binary, (const struct ia_css_frame **)args->tnr_frames);
 #endif
-	return err;
+	return IA_CSS_SUCCESS;
 }
 
 static void
Signature · 1 line
2.7.4
#1 lore raw
Quoted 6 lines · Georgiana Rodica Chelu

Remove the local variables used to store the return value because their initial value does not change during the function execution.

---
.../media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c |

4 +---

Quoted 1 line

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c |

4 +---

Quoted 1 line

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c |

3 +--

Quoted 3 lines
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git

a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c

Quoted 2 lines

index 239ef31..2ed5162 100644
---

a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c

Quoted 1 line

+++

b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c

Quoted 18 lines
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c +1 -3
@@ -105,8 +105,6 @@ input_system_error_t ia_css_isys_init(void)
 #elif defined(USE_INPUT_SYSTEM_VERSION_2401)
 input_system_error_t ia_css_isys_init(void)
 {
-       input_system_error_t error = INPUT_SYSTEM_ERR_NO_ERROR;
-
        ia_css_isys_csi_rx_lut_rmgr_init();
        ia_css_isys_ibuf_rmgr_init();
        ia_css_isys_dma_channel_rmgr_init();
@@ -120,7 +118,7 @@ input_system_error_t ia_css_isys_init(void)
        isys_irqc_status_enable(ISYS_IRQ1_ID);
        isys_irqc_status_enable(ISYS_IRQ2_ID);
 
-       return error;
+       return INPUT_SYSTEM_ERR_NO_ERROR;
 }
 #endif
 
Quoted 1 line

diff --git

a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c

Quoted 17 lines

index b251ba4..4a7a603 100644

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c +1 -3
@@ -37,12 +37,10 @@ enum ia_css_err
 ia_css_mipi_frame_specify(const unsigned int size_mem_words,
                                const bool contiguous)
 {
-       enum ia_css_err err = IA_CSS_SUCCESS;
-
        my_css.size_mem_words = size_mem_words;
        (void)contiguous;
 
-       return err;
+       return IA_CSS_SUCCESS;
 }
 
 #ifdef ISP2401
Quoted 1 line

diff --git

a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c

Quoted 12 lines

index 00b2d16..9caf0b6 100644

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +0 -1
@@ -825,7 +825,6 @@ configure_isp_from_args(
        bool two_ppc,
        bool deinterleaved)
 {
-       enum ia_css_err err = IA_CSS_SUCCESS;
 #ifdef ISP2401
        struct ia_css_pipe *pipe = find_pipe_by_num(pipeline->pipe_num);
        const struct ia_css_resolution *res;

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c configure_isp_from_args( · line 853

Quoted 2 lines
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +0 -0
@@ -853,7 +852,7 @@ configure_isp_from_args(
        /* Remove support for TNR2 once TNR3 fully integrated */
        ia_css_tnr3_configure(binary, (const struct ia_css_frame

**)args->tnr_frames);

Quoted 9 lines
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +1 -2
 #endif
-       return err;
+       return IA_CSS_SUCCESS;
 }
 
 static void
--

2.7.4

This patch is the improved of this one (link
<https://groups.google.com/forum/#%21topic/outreachy-kernel/7os1b-WHVJg>).
I chose to create a new patch because the file was slightly different due to the passed time between the two patches.

Regards,
Georgiana