[Outreachy kernel][PATCH v3] staging: bcm2835-camera: Remove 'ret' variable

[Outreachy kernel][PATCH v3] staging: bcm2835-camera: Remove 'ret' variable

[Bhanusree Pola]

Return value to be returned without using extra variable 'ret'.
Removed the useless variable 'ret' by hand using coccinelle semantic patch ret.cocci
The following is the ret.cocci semantic patch used:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Bhanusree Pola <bhanusreemahesh@gmail.com>
---

changelog:

v2: Include semantic patch used in the commit message
v3: Modified Commit message

 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index c04bdf0..a124f51 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1510,7 +1510,6 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
 				 struct vchiq_mmal_component *camera,
 				 struct bm2835_mmal_dev *dev)
 {
-	int ret;
 	struct mmal_parameter_camera_config cam_config = {
 		.max_stills_w = dev->max_width,
 		.max_stills_h = dev->max_height,
@@ -1526,10 +1525,9 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
 		.use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC
 	};
 
-	ret = vchiq_mmal_port_parameter_set(instance, &camera->control,
+	return vchiq_mmal_port_parameter_set(instance, &camera->control,
 					    MMAL_PARAMETER_CAMERA_CONFIG,
 					    &cam_config, sizeof(cam_config));
-	return ret;
 }
 
 #define MAX_SUPPORTED_ENCODINGS 20
-- 
2.7.4

Re: [Outreachy kernel][PATCH v3] staging: bcm2835-camera: Remove 'ret' variable

[Julia Lawall]

On Mon, 15 Oct 2018, Bhanusree Pola wrote:

> Return value to be returned without using extra variable 'ret'.
> Removed the useless variable 'ret' by hand using coccinelle semantic patch ret.cocci
> The following is the ret.cocci semantic patch used:

Sorry to be endlessly picky, but Coccinelle removed the uses of the
variable, and you removed the declaration of the variable by hand.  If one
looks at your semantic patch, one doesn't see anything that removes int
ret.

julia

>
> @@
> local idexpression ret;
> expression e;
> @@
>
> -ret =
> +return
>      e;
> -return ret;
>
> Signed-off-by: Bhanusree Pola <bhanusreemahesh@gmail.com>
> ---
>
> changelog:
>
> v2: Include semantic patch used in the commit message
> v3: Modified Commit message
>
>  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index c04bdf0..a124f51 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -1510,7 +1510,6 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
>  				 struct vchiq_mmal_component *camera,
>  				 struct bm2835_mmal_dev *dev)
>  {
> -	int ret;
>  	struct mmal_parameter_camera_config cam_config = {
>  		.max_stills_w = dev->max_width,
>  		.max_stills_h = dev->max_height,
> @@ -1526,10 +1525,9 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
>  		.use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC
>  	};
>
> -	ret = vchiq_mmal_port_parameter_set(instance, &camera->control,
> +	return vchiq_mmal_port_parameter_set(instance, &camera->control,
>  					    MMAL_PARAMETER_CAMERA_CONFIG,
>  					    &cam_config, sizeof(cam_config));
> -	return ret;
>  }
>
>  #define MAX_SUPPORTED_ENCODINGS 20
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20181015091720.GA16418%40aakashd-VirtualBox.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel][PATCH v3] staging: bcm2835-camera: Remove 'ret' variable

[Bhanusree Mahesh]

On Mon, 22 Oct 2018 at 10:31, Bhanusree Mahesh
<bhanusreemahesh@gmail.com> wrote:
>
> On Mon, 22 Oct 2018 at 10:26, Bhanusree Mahesh
> <bhanusreemahesh@gmail.com> wrote:
> >
> > On Mon, 15 Oct 2018 at 14:48, Bhanusree Pola <bhanusreemahesh@gmail.com> wrote:
> > >
> > > Return value to be returned without using extra variable 'ret'.
> > > Removed the useless variable 'ret' by hand using coccinelle semantic patch ret.cocci
> > > The following is the ret.cocci semantic patch used:
> > >
> > > @@
> > > local idexpression ret;
> > > expression e;
> > > @@
> > >
> > > -ret =
> > > +return
> > >      e;
> > > -return ret;
> > >
> > > Signed-off-by: Bhanusree Pola <bhanusreemahesh@gmail.com>
> > > ---
> > >
> > > changelog:
> > >
> > > v2: Include semantic patch used in the commit message
> > > v3: Modified Commit message
> > >
> > >  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +---
> > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> > > index c04bdf0..a124f51 100644
> > > --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> > > +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> > > @@ -1510,7 +1510,6 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
> > >                                  struct vchiq_mmal_component *camera,
> > >                                  struct bm2835_mmal_dev *dev)
> > >  {
> > > -       int ret;
> > >         struct mmal_parameter_camera_config cam_config = {
> > >                 .max_stills_w = dev->max_width,
> > >                 .max_stills_h = dev->max_height,
> > > @@ -1526,10 +1525,9 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
> > >                 .use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC
> > >         };
> > >
> > > -       ret = vchiq_mmal_port_parameter_set(instance, &camera->control,
> > > +       return vchiq_mmal_port_parameter_set(instance, &camera->control,
> > >                                             MMAL_PARAMETER_CAMERA_CONFIG,
> > >                                             &cam_config, sizeof(cam_config));
> > > -       return ret;
> > >  }
> > >
> > >  #define MAX_SUPPORTED_ENCODINGS 20
> > > --
> > > 2.7.4
> > >
Any modifications required for this to be accepted?


 Bhanusree