Patchwork [1/42] drivers/net/wan: Adjust confusing if indentation

login
register
mail settings
Submitter Julia Lawall
Date Aug. 5, 2010, 8:17 p.m.
Message ID <Pine.LNX.4.64.1008052216400.31692@ask.diku.dk>
Download mbox | patch
Permalink /patch/61021/
State Accepted
Delegated to: David Miller
Headers show

Comments

Julia Lawall - Aug. 5, 2010, 8:17 p.m.
From: Julia Lawall <julia@diku.dk>

Indent the branch of an if.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/net/wan/c101.c      |    2 +-
 drivers/net/wan/n2.c        |    2 +-
 drivers/net/wan/pci200syn.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Halasa - Aug. 7, 2010, 12:37 p.m.
Julia Lawall <julia@diku.dk> writes:

>  drivers/net/wan/c101.c      |    2 +-
>  drivers/net/wan/n2.c        |    2 +-
>  drivers/net/wan/pci200syn.c |    2 +-

Fully Acked-by: Krzysztof Hałasa <khc@pm.waw.pl>
Thanks.
David Miller - Aug. 17, 2010, 3:57 a.m.
From: Krzysztof Halasa <khc@pm.waw.pl>
Date: Sat, 07 Aug 2010 14:37:37 +0200

> Julia Lawall <julia@diku.dk> writes:
> 
>>  drivers/net/wan/c101.c      |    2 +-
>>  drivers/net/wan/n2.c        |    2 +-
>>  drivers/net/wan/pci200syn.c |    2 +-
> 
> Fully Acked-by: Krzysztof Hałasa <khc@pm.waw.pl>

Please don't use non-standard commit tags like this "Fully Acked-by:"
thing, otherwise automated tools won't notice and pick them up
properly.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 17, 2010, 8:49 a.m.
Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 0bd898c..4ac85a0 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -264,7 +264,7 @@  static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 		    new_line.clock_type != CLOCK_TXFROMRX &&
 		    new_line.clock_type != CLOCK_INT &&
 		    new_line.clock_type != CLOCK_TXINT)
-		return -EINVAL;	/* No such clock setting */
+			return -EINVAL;	/* No such clock setting */
 
 		if (new_line.loopback != 0 && new_line.loopback != 1)
 			return -EINVAL;
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 5394b51..7a3720f 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -282,7 +282,7 @@  static int n2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 		    new_line.clock_type != CLOCK_TXFROMRX &&
 		    new_line.clock_type != CLOCK_INT &&
 		    new_line.clock_type != CLOCK_TXINT)
-		return -EINVAL;	/* No such clock setting */
+			return -EINVAL;	/* No such clock setting */
 
 		if (new_line.loopback != 0 && new_line.loopback != 1)
 			return -EINVAL;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index e2cff64..fd73759 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -220,7 +220,7 @@  static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 		    new_line.clock_type != CLOCK_TXFROMRX &&
 		    new_line.clock_type != CLOCK_INT &&
 		    new_line.clock_type != CLOCK_TXINT)
-		return -EINVAL;	/* No such clock setting */
+			return -EINVAL;	/* No such clock setting */
 
 		if (new_line.loopback != 0 && new_line.loopback != 1)
 			return -EINVAL;