* [PATCH 5/6] staging: comedi: drivers: dt282x: Merge if conditions
@ 2016-02-10 8:59 Amitoj Kaur Chawla
2016-02-12 3:44 ` [Outreachy kernel] " Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Amitoj Kaur Chawla @ 2016-02-10 8:59 UTC (permalink / raw)
To: outreachy-kernel
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;
outw(devpriv->supcsr | DT2821_SUPCSR_STRIG,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [PATCH 5/6] staging: comedi: drivers: dt282x: Merge if conditions
2016-02-10 8:59 [PATCH 5/6] staging: comedi: drivers: dt282x: Merge if conditions Amitoj Kaur Chawla
@ 2016-02-12 3:44 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2016-02-12 3:44 UTC (permalink / raw)
To: Amitoj Kaur Chawla; +Cc: outreachy-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-12 3:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-10 8:59 [PATCH 5/6] staging: comedi: drivers: dt282x: Merge if conditions Amitoj Kaur Chawla
2016-02-12 3:44 ` [Outreachy kernel] " Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.