Re: [Outreachy kernel] [PATCH] staging: dgap: Merge two separate if conditions

Re: [Outreachy kernel] [PATCH] staging: dgap: Merge two separate if conditions

[Sudip Mukherjee]

On Tue, Feb 09, 2016 at 12:17:35PM -0500, Janani Ravichandran wrote:
> Merge two if conditions with the same statements to avoid code
> duplication.
> 
> Signed-off-by: Janani Ravichandran <janani.rvchndrn@gmail.com>
> ---
>  drivers/staging/dgap/dgap.c | 6 +-----

dgap is no longer in staging tree. Which tree are you using?

regards
sudip

Re: [Outreachy kernel] [PATCH] staging: dgap: Merge two separate if conditions

[Julia Lawall]

On Tue, 9 Feb 2016, Sudip Mukherjee wrote:

> On Tue, Feb 09, 2016 at 12:17:35PM -0500, Janani Ravichandran wrote:
> > Merge two if conditions with the same statements to avoid code
> > duplication.
> >
> > Signed-off-by: Janani Ravichandran <janani.rvchndrn@gmail.com>
> > ---
> >  drivers/staging/dgap/dgap.c | 6 +-----
>
> dgap is no longer in staging tree. Which tree are you using?

Even if the patch is not useful any more, you could use Coccinelle to see
if there are other occurrences of the same situation.

julia

[PATCH] staging: dgap: Merge two separate if conditions

[Janani Ravichandran]

Merge two if conditions with the same statements to avoid code
duplication.

Signed-off-by: Janani Ravichandran <janani.rvchndrn@gmail.com>
---
 drivers/staging/dgap/dgap.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index bad3551..d7eb879 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -2014,11 +2014,7 @@ static void dgap_poll_tasklet(unsigned long data)
 	if (bd->state == BOARD_READY) {
 		struct ev_t __iomem *eaddr;
 
-		if (!bd->re_map_membase) {
-			spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
-			return;
-		}
-		if (!bd->re_map_port) {
+		if (!bd->re_map_membase || !bd->re_map_port) {
 			spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 			return;
 		}
-- 
2.5.0