2010-08-05 20:17:06

by Julia Lawall

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

From: Julia Lawall <[email protected]>

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 <[email protected]>

---
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(-)

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;

2010-08-07 12:37:42

by Krzysztof Halasa

Subject: Re: [PATCH 1/42] drivers/net/wan: Adjust confusing if indentation

Julia Lawall <[email protected]> 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 <[email protected]>
Thanks.
--
Krzysztof Halasa

2010-08-17 03:56:53

by David Miller

Subject: Re: [PATCH 1/42] drivers/net/wan: Adjust confusing if indentation

From: Krzysztof Halasa <[email protected]>
Date: Sat, 07 Aug 2010 14:37:37 +0200

> Julia Lawall <[email protected]> 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 <[email protected]>

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.

2010-08-17 08:48:52

by David Miller

Subject: Re: [PATCH 1/42] drivers/net/wan: Adjust confusing if indentation

Applied.