diff options
author | Julia Lawall <julia@diku.dk> | 2010-08-05 06:22:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-17 00:06:26 -0400 |
commit | 022484c17253aea84aa2603068ea065ca59bb5e5 (patch) | |
tree | 0c1c047589aaf2eefd0ef564e684fc54ef905500 /drivers | |
parent | 9b0f1d85968334c9bbe8675a0fc676c6e15ba577 (diff) |
drivers/net: Adjust confusing if indentation
In amd8111e.c, indent the branch of an if.
In eepro.c, outdent the code following the 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/amd8111e.c | 4 | ||||
-rw-r--r-- | drivers/net/eepro.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 585c25f4b60c..1f5fc64b3224 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -396,7 +396,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod) | |||
396 | event_count = coal_conf->rx_event_count; | 396 | event_count = coal_conf->rx_event_count; |
397 | if( timeout > MAX_TIMEOUT || | 397 | if( timeout > MAX_TIMEOUT || |
398 | event_count > MAX_EVENT_COUNT ) | 398 | event_count > MAX_EVENT_COUNT ) |
399 | return -EINVAL; | 399 | return -EINVAL; |
400 | 400 | ||
401 | timeout = timeout * DELAY_TIMER_CONV; | 401 | timeout = timeout * DELAY_TIMER_CONV; |
402 | writel(VAL0|STINTEN, mmio+INTEN0); | 402 | writel(VAL0|STINTEN, mmio+INTEN0); |
@@ -409,7 +409,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod) | |||
409 | event_count = coal_conf->tx_event_count; | 409 | event_count = coal_conf->tx_event_count; |
410 | if( timeout > MAX_TIMEOUT || | 410 | if( timeout > MAX_TIMEOUT || |
411 | event_count > MAX_EVENT_COUNT ) | 411 | event_count > MAX_EVENT_COUNT ) |
412 | return -EINVAL; | 412 | return -EINVAL; |
413 | 413 | ||
414 | 414 | ||
415 | timeout = timeout * DELAY_TIMER_CONV; | 415 | timeout = timeout * DELAY_TIMER_CONV; |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 8d97f168f018..7c826319ee5a 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1457,11 +1457,11 @@ hardware_send_packet(struct net_device *dev, void *buf, short length) | |||
1457 | if (net_debug > 5) | 1457 | if (net_debug > 5) |
1458 | printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name); | 1458 | printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name); |
1459 | 1459 | ||
1460 | /* determine how much of the transmit buffer space is available */ | 1460 | /* determine how much of the transmit buffer space is available */ |
1461 | if (lp->tx_end > lp->tx_start) | 1461 | if (lp->tx_end > lp->tx_start) |
1462 | tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start); | 1462 | tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start); |
1463 | else if (lp->tx_end < lp->tx_start) | 1463 | else if (lp->tx_end < lp->tx_start) |
1464 | tx_available = lp->tx_start - lp->tx_end; | 1464 | tx_available = lp->tx_start - lp->tx_end; |
1465 | else tx_available = lp->xmt_ram; | 1465 | else tx_available = lp->xmt_ram; |
1466 | 1466 | ||
1467 | if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) { | 1467 | if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) { |