Re: [Outreachy kernel] [PATCH 5/6] staging: comedi: drivers: dt282x: Merge if conditions

[Greg KH <gregkh@linuxfoundation.org>]

On Wed, Feb 10, 2016 at 02:29:34PM +0530, Amitoj Kaur Chawla wrote:
> Merge if conditions with the same statements.
> 
> Found using Coccinelle. The semantic patch used to find this is as
> follows:
> 
> //<smpl>
> @@
> statement S;
> expression e,x;
> @@
> 
> * if(e)
> (
> { ... return ...; }
> &
> S
> )
> 
> * if(x)
> (
> { ... return ...; }
> &
> S
> )
> //</smpl>
> 
> Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
> ---
>  drivers/staging/comedi/drivers/dt282x.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
> index 5a536a0..ded985e 100644
> --- a/drivers/staging/comedi/drivers/dt282x.c
> +++ b/drivers/staging/comedi/drivers/dt282x.c
> @@ -887,10 +887,7 @@ static int dt282x_ao_inttrig(struct comedi_device *dev,
>  	if (trig_num != cmd->start_src)
>  		return -EINVAL;
>  
> -	if (!dt282x_ao_setup_dma(dev, s, 0))
> -		return -EPIPE;
> -
> -	if (!dt282x_ao_setup_dma(dev, s, 1))
> +	if (!(dt282x_ao_setup_dma(dev, s, 0) && dt282x_ao_setup_dma(dev, s, 1)))
>  		return -EPIPE;

Still not going to take this, sorry.

greg k-h