[PATCH 4/6] staging: comedi: range: Merge if conditions

[PATCH 4/6] staging: comedi: range: Merge if conditions

[Amitoj Kaur Chawla]

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/range.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index ce3a58a..f5c63ab 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -67,9 +67,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,
 	subd = (it.range_type >> 24) & 0xf;
 	chan = (it.range_type >> 16) & 0xff;
 
-	if (!dev->attached)
-		return -EINVAL;
-	if (subd >= dev->n_subdevices)
+	if (!dev->attached || (subd >= dev->n_subdevices))
 		return -EINVAL;
 	s = &dev->subdevices[subd];
 	if (s->range_table) {
-- 
1.9.1

Re: [Outreachy kernel] [PATCH 4/6] staging: comedi: range: Merge if conditions

[Julia Lawall]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1640 bytes --]



On Wed, 10 Feb 2016, 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/range.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
> index ce3a58a..f5c63ab 100644
> --- a/drivers/staging/comedi/range.c
> +++ b/drivers/staging/comedi/range.c
> @@ -67,9 +67,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,
>  	subd = (it.range_type >> 24) & 0xf;
>  	chan = (it.range_type >> 16) & 0xff;
>
> -	if (!dev->attached)
> -		return -EINVAL;
> -	if (subd >= dev->n_subdevices)
> +	if (!dev->attached || (subd >= dev->n_subdevices))

You don´t need the parentheses.

julia

>  		return -EINVAL;
>  	s = &dev->subdevices[subd];
>  	if (s->range_table) {
> --
> 1.9.1
>
> --
> 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/20160210085928.GA14628%40amitoj-Inspiron-3542.
> For more options, visit https://groups.google.com/d/optout.
>