[PATCH v2] media:atomisp:pci Remove unnecessary variable

Georgiana Rodica Chelu georgiana.chelu93 at gmail.com
Sat Mar 4 14:34:35 EET 2017


Remove the local variable "ret" because its initial
value does not change during the function execution.

Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93 at gmail.com>
---

Changes in v2:
	- remove the other unnecessary local variables from pci module

 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c           | 5 ++---
 .../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 +--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
index 0a0652a..bc09914 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c
@@ -557,8 +557,6 @@ const struct atomisp_format_bridge *atomisp_get_format_bridge_from_mbus(u32
 static int atomisp_querycap(struct file *file, void *fh,
 			    struct v4l2_capability *cap)
 {
-	int ret = 0;
-
 	memset(cap, 0, sizeof(struct v4l2_capability));
 
 	WARN_ON(sizeof(DRIVER) > sizeof(cap->driver) ||
@@ -574,7 +572,8 @@ static int atomisp_querycap(struct file *file, void *fh,
 	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
 	    V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;
 	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
-	return ret;
+
+	return 0;
 }
 
 /*
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
index 239ef31..2ed5162 100644
--- 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
@@ -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
 
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
index 1210c21..bc4b623 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
@@ -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
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
index 00b2d16..9caf0b6 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
@@ -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
-- 
2.7.4



More information about the firefly mailing list